ASoc: Intel: boards: update constraints for nau88l25_ssm4567 machine
We have specific constraints for FE device (48KHz, stereo, 16 bits) and fixups for BE DMIC links (2 or 4 ch), so add those. Also add one more FE DAIlink for dmiccap Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Fang, Yang A <yang.a.fang@intel.com> Signed-off-by: Jeeja KP <jeeja.kp@intel.com> Signed-off-by: Yong Zhi <yong.zhi@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
941eee7456
commit
2616e27efb
1 changed files with 136 additions and 0 deletions
|
@ -192,6 +192,65 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
|
{
|
||||||
|
struct snd_soc_dapm_context *dapm;
|
||||||
|
struct snd_soc_component *component = rtd->cpu_dai->component;
|
||||||
|
|
||||||
|
dapm = snd_soc_component_get_dapm(component);
|
||||||
|
snd_soc_dapm_ignore_suspend(dapm, "Reference Capture");
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned int rates[] = {
|
||||||
|
48000,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct snd_pcm_hw_constraint_list constraints_rates = {
|
||||||
|
.count = ARRAY_SIZE(rates),
|
||||||
|
.list = rates,
|
||||||
|
.mask = 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
static unsigned int channels[] = {
|
||||||
|
2,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct snd_pcm_hw_constraint_list constraints_channels = {
|
||||||
|
.count = ARRAY_SIZE(channels),
|
||||||
|
.list = channels,
|
||||||
|
.mask = 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int skl_fe_startup(struct snd_pcm_substream *substream)
|
||||||
|
{
|
||||||
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* on this platform for PCM device we support,
|
||||||
|
* 48Khz
|
||||||
|
* stereo
|
||||||
|
* 16 bit audio
|
||||||
|
*/
|
||||||
|
|
||||||
|
runtime->hw.channels_max = 2;
|
||||||
|
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
|
||||||
|
&constraints_channels);
|
||||||
|
|
||||||
|
runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE;
|
||||||
|
snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16);
|
||||||
|
|
||||||
|
snd_pcm_hw_constraint_list(runtime, 0,
|
||||||
|
SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct snd_soc_ops skylake_nau8825_fe_ops = {
|
||||||
|
.startup = skl_fe_startup,
|
||||||
|
};
|
||||||
|
|
||||||
static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
|
static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
|
||||||
struct snd_pcm_hw_params *params)
|
struct snd_pcm_hw_params *params)
|
||||||
{
|
{
|
||||||
|
@ -211,6 +270,19 @@ static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int skylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd,
|
||||||
|
struct snd_pcm_hw_params *params)
|
||||||
|
{
|
||||||
|
struct snd_interval *channels = hw_param_interval(params,
|
||||||
|
SNDRV_PCM_HW_PARAM_CHANNELS);
|
||||||
|
if (params_channels(params) == 2)
|
||||||
|
channels->min = channels->max = 2;
|
||||||
|
else
|
||||||
|
channels->min = channels->max = 4;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream,
|
static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream,
|
||||||
struct snd_pcm_hw_params *params)
|
struct snd_pcm_hw_params *params)
|
||||||
{
|
{
|
||||||
|
@ -231,6 +303,52 @@ static struct snd_soc_ops skylake_nau8825_ops = {
|
||||||
.hw_params = skylake_nau8825_hw_params,
|
.hw_params = skylake_nau8825_hw_params,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static unsigned int channels_dmic[] = {
|
||||||
|
2, 4,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct snd_pcm_hw_constraint_list constraints_dmic_channels = {
|
||||||
|
.count = ARRAY_SIZE(channels_dmic),
|
||||||
|
.list = channels_dmic,
|
||||||
|
.mask = 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int skylake_dmic_startup(struct snd_pcm_substream *substream)
|
||||||
|
{
|
||||||
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||||
|
|
||||||
|
runtime->hw.channels_max = 4;
|
||||||
|
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
|
||||||
|
&constraints_dmic_channels);
|
||||||
|
|
||||||
|
return snd_pcm_hw_constraint_list(substream->runtime, 0,
|
||||||
|
SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct snd_soc_ops skylake_dmic_ops = {
|
||||||
|
.startup = skylake_dmic_startup,
|
||||||
|
};
|
||||||
|
|
||||||
|
static unsigned int rates_16000[] = {
|
||||||
|
16000,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct snd_pcm_hw_constraint_list constraints_16000 = {
|
||||||
|
.count = ARRAY_SIZE(rates_16000),
|
||||||
|
.list = rates_16000,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int skylake_refcap_startup(struct snd_pcm_substream *substream)
|
||||||
|
{
|
||||||
|
return snd_pcm_hw_constraint_list(substream->runtime, 0,
|
||||||
|
SNDRV_PCM_HW_PARAM_RATE,
|
||||||
|
&constraints_16000);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct snd_soc_ops skylaye_refcap_ops = {
|
||||||
|
.startup = skylake_refcap_startup,
|
||||||
|
};
|
||||||
|
|
||||||
/* skylake digital audio interface glue - connects codec <--> CPU */
|
/* skylake digital audio interface glue - connects codec <--> CPU */
|
||||||
static struct snd_soc_dai_link skylake_dais[] = {
|
static struct snd_soc_dai_link skylake_dais[] = {
|
||||||
/* Front End DAI links */
|
/* Front End DAI links */
|
||||||
|
@ -243,9 +361,11 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
||||||
.codec_name = "snd-soc-dummy",
|
.codec_name = "snd-soc-dummy",
|
||||||
.codec_dai_name = "snd-soc-dummy-dai",
|
.codec_dai_name = "snd-soc-dummy-dai",
|
||||||
.nonatomic = 1,
|
.nonatomic = 1,
|
||||||
|
.init = skylake_nau8825_fe_init,
|
||||||
.trigger = {
|
.trigger = {
|
||||||
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||||
.dpcm_playback = 1,
|
.dpcm_playback = 1,
|
||||||
|
.ops = &skylake_nau8825_fe_ops,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "Skl Audio Capture Port",
|
.name = "Skl Audio Capture Port",
|
||||||
|
@ -259,6 +379,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
||||||
.trigger = {
|
.trigger = {
|
||||||
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||||
.dpcm_capture = 1,
|
.dpcm_capture = 1,
|
||||||
|
.ops = &skylake_nau8825_fe_ops,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "Skl Audio Reference cap",
|
.name = "Skl Audio Reference cap",
|
||||||
|
@ -272,6 +393,20 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
||||||
.ignore_suspend = 1,
|
.ignore_suspend = 1,
|
||||||
.nonatomic = 1,
|
.nonatomic = 1,
|
||||||
.dynamic = 1,
|
.dynamic = 1,
|
||||||
|
.ops = &skylaye_refcap_ops,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.name = "Skl Audio DMIC cap",
|
||||||
|
.stream_name = "dmiccap",
|
||||||
|
.cpu_dai_name = "DMIC Pin",
|
||||||
|
.codec_name = "snd-soc-dummy",
|
||||||
|
.codec_dai_name = "snd-soc-dummy-dai",
|
||||||
|
.platform_name = "0000:00:1f.3",
|
||||||
|
.init = NULL,
|
||||||
|
.dpcm_capture = 1,
|
||||||
|
.nonatomic = 1,
|
||||||
|
.dynamic = 1,
|
||||||
|
.ops = &skylake_dmic_ops,
|
||||||
},
|
},
|
||||||
/* Back End DAI links */
|
/* Back End DAI links */
|
||||||
{
|
{
|
||||||
|
@ -317,6 +452,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
||||||
.codec_dai_name = "dmic-hifi",
|
.codec_dai_name = "dmic-hifi",
|
||||||
.platform_name = "0000:00:1f.3",
|
.platform_name = "0000:00:1f.3",
|
||||||
.ignore_suspend = 1,
|
.ignore_suspend = 1,
|
||||||
|
.be_hw_params_fixup = skylake_dmic_fixup,
|
||||||
.dpcm_capture = 1,
|
.dpcm_capture = 1,
|
||||||
.no_pcm = 1,
|
.no_pcm = 1,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue