ASoC: Intel: sof_rt5682: use common module for DAI link generation
Use intel_board module to generate DAI link array and update num_links field in snd_soc_card structure. Signed-off-by: Brent Lu <brent.lu@intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20231127152654.28204-28-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Brent Lu
Mark Brown
parent
5da85a3523
commit
8fa1116e1c
@ -563,52 +563,45 @@ static struct snd_soc_dai_link_component rt5650_components[] = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_soc_dai_link *
|
||||
sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type,
|
||||
enum sof_ssp_codec amp_type, int ssp_codec,
|
||||
int ssp_amp, int dmic_be_num, int hdmi_num,
|
||||
bool idisp_codec, bool is_legacy_cpu)
|
||||
static int
|
||||
sof_card_dai_links_create(struct device *dev, struct snd_soc_card *card,
|
||||
struct sof_card_private *ctx)
|
||||
{
|
||||
struct snd_soc_dai_link *links;
|
||||
int i;
|
||||
int id = 0;
|
||||
int ret;
|
||||
|
||||
links = devm_kcalloc(dev, sof_audio_card_rt5682.num_links,
|
||||
sizeof(struct snd_soc_dai_link), GFP_KERNEL);
|
||||
if (!links)
|
||||
goto devm_err;
|
||||
|
||||
/* codec SSP */
|
||||
ret = sof_intel_board_set_codec_link(dev, &links[id], id, codec_type,
|
||||
ssp_codec);
|
||||
ret = sof_intel_board_set_dai_link(dev, card, ctx);
|
||||
if (ret)
|
||||
return NULL;
|
||||
return ret;
|
||||
|
||||
/* codec-specific fields */
|
||||
switch (codec_type) {
|
||||
case CODEC_RT5650:
|
||||
links[id].codecs = &rt5650_components[0];
|
||||
links[id].num_codecs = 1;
|
||||
break;
|
||||
case CODEC_RT5682:
|
||||
links[id].codecs = rt5682_component;
|
||||
links[id].num_codecs = ARRAY_SIZE(rt5682_component);
|
||||
break;
|
||||
case CODEC_RT5682S:
|
||||
links[id].codecs = rt5682s_component;
|
||||
links[id].num_codecs = ARRAY_SIZE(rt5682s_component);
|
||||
break;
|
||||
default:
|
||||
dev_err(dev, "invalid codec type %d\n", codec_type);
|
||||
return NULL;
|
||||
if (!ctx->codec_link) {
|
||||
dev_err(dev, "codec link not available");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
links[id].init = sof_rt5682_codec_init;
|
||||
links[id].exit = sof_rt5682_codec_exit;
|
||||
links[id].ops = &sof_rt5682_ops;
|
||||
/* codec-specific fields for headphone codec */
|
||||
switch (ctx->codec_type) {
|
||||
case CODEC_RT5650:
|
||||
ctx->codec_link->codecs = &rt5650_components[0];
|
||||
ctx->codec_link->num_codecs = 1;
|
||||
break;
|
||||
case CODEC_RT5682:
|
||||
ctx->codec_link->codecs = rt5682_component;
|
||||
ctx->codec_link->num_codecs = ARRAY_SIZE(rt5682_component);
|
||||
break;
|
||||
case CODEC_RT5682S:
|
||||
ctx->codec_link->codecs = rt5682s_component;
|
||||
ctx->codec_link->num_codecs = ARRAY_SIZE(rt5682s_component);
|
||||
break;
|
||||
default:
|
||||
dev_err(dev, "invalid codec type %d\n", ctx->codec_type);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!is_legacy_cpu) {
|
||||
ctx->codec_link->init = sof_rt5682_codec_init;
|
||||
ctx->codec_link->exit = sof_rt5682_codec_exit;
|
||||
ctx->codec_link->ops = &sof_rt5682_ops;
|
||||
|
||||
if (!ctx->rt5682.is_legacy_cpu) {
|
||||
/*
|
||||
* Currently, On SKL+ platforms MCLK will be turned off in sof
|
||||
* runtime suspended, and it will go into runtime suspended
|
||||
@ -618,130 +611,64 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type,
|
||||
* avoid the noise.
|
||||
* It can be removed once we can control MCLK by driver.
|
||||
*/
|
||||
links[id].ignore_pmdown_time = 1;
|
||||
}
|
||||
id++;
|
||||
|
||||
/* dmic */
|
||||
if (dmic_be_num > 0) {
|
||||
/* at least we have dmic01 */
|
||||
ret = sof_intel_board_set_dmic_link(dev, &links[id], id,
|
||||
SOF_DMIC_01);
|
||||
if (ret)
|
||||
return NULL;
|
||||
|
||||
id++;
|
||||
ctx->codec_link->ignore_pmdown_time = 1;
|
||||
}
|
||||
|
||||
if (dmic_be_num > 1) {
|
||||
/* set up 2 BE links at most */
|
||||
ret = sof_intel_board_set_dmic_link(dev, &links[id], id,
|
||||
SOF_DMIC_16K);
|
||||
if (ret)
|
||||
return NULL;
|
||||
if (ctx->amp_type == CODEC_NONE)
|
||||
return 0;
|
||||
|
||||
id++;
|
||||
if (!ctx->amp_link) {
|
||||
dev_err(dev, "amp link not available");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* HDMI */
|
||||
for (i = 1; i <= hdmi_num; i++) {
|
||||
ret = sof_intel_board_set_intel_hdmi_link(dev, &links[id], id,
|
||||
i, idisp_codec);
|
||||
if (ret)
|
||||
return NULL;
|
||||
|
||||
id++;
|
||||
/* codec-specific fields for speaker amplifier */
|
||||
switch (ctx->amp_type) {
|
||||
case CODEC_MAX98357A:
|
||||
max_98357a_dai_link(ctx->amp_link);
|
||||
break;
|
||||
case CODEC_MAX98360A:
|
||||
max_98360a_dai_link(ctx->amp_link);
|
||||
break;
|
||||
case CODEC_MAX98373:
|
||||
ctx->amp_link->codecs = max_98373_components;
|
||||
ctx->amp_link->num_codecs = ARRAY_SIZE(max_98373_components);
|
||||
ctx->amp_link->init = max_98373_spk_codec_init;
|
||||
ctx->amp_link->ops = &max_98373_ops;
|
||||
break;
|
||||
case CODEC_MAX98390:
|
||||
max_98390_dai_link(dev, ctx->amp_link);
|
||||
break;
|
||||
case CODEC_RT1011:
|
||||
sof_rt1011_dai_link(ctx->amp_link);
|
||||
break;
|
||||
case CODEC_RT1015:
|
||||
sof_rt1015_dai_link(ctx->amp_link);
|
||||
break;
|
||||
case CODEC_RT1015P:
|
||||
sof_rt1015p_dai_link(ctx->amp_link);
|
||||
break;
|
||||
case CODEC_RT1019P:
|
||||
sof_rt1019p_dai_link(ctx->amp_link);
|
||||
break;
|
||||
case CODEC_RT5650:
|
||||
/* use AIF2 to support speaker pipeline */
|
||||
ctx->amp_link->codecs = &rt5650_components[1];
|
||||
ctx->amp_link->num_codecs = 1;
|
||||
ctx->amp_link->init = rt5650_spk_init;
|
||||
ctx->amp_link->ops = &sof_rt5682_ops;
|
||||
break;
|
||||
default:
|
||||
dev_err(dev, "invalid amp type %d\n", ctx->amp_type);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* speaker amp */
|
||||
if (amp_type != CODEC_NONE) {
|
||||
ret = sof_intel_board_set_ssp_amp_link(dev, &links[id], id,
|
||||
amp_type, ssp_amp);
|
||||
if (ret)
|
||||
return NULL;
|
||||
|
||||
/* codec-specific fields */
|
||||
switch (amp_type) {
|
||||
case CODEC_MAX98357A:
|
||||
max_98357a_dai_link(&links[id]);
|
||||
break;
|
||||
case CODEC_MAX98360A:
|
||||
max_98360a_dai_link(&links[id]);
|
||||
break;
|
||||
case CODEC_MAX98373:
|
||||
links[id].codecs = max_98373_components;
|
||||
links[id].num_codecs = ARRAY_SIZE(max_98373_components);
|
||||
links[id].init = max_98373_spk_codec_init;
|
||||
links[id].ops = &max_98373_ops;
|
||||
break;
|
||||
case CODEC_MAX98390:
|
||||
max_98390_dai_link(dev, &links[id]);
|
||||
break;
|
||||
case CODEC_RT1011:
|
||||
sof_rt1011_dai_link(&links[id]);
|
||||
break;
|
||||
case CODEC_RT1015:
|
||||
sof_rt1015_dai_link(&links[id]);
|
||||
break;
|
||||
case CODEC_RT1015P:
|
||||
sof_rt1015p_dai_link(&links[id]);
|
||||
break;
|
||||
case CODEC_RT1019P:
|
||||
sof_rt1019p_dai_link(&links[id]);
|
||||
break;
|
||||
case CODEC_RT5650:
|
||||
/* use AIF2 to support speaker pipeline */
|
||||
links[id].codecs = &rt5650_components[1];
|
||||
links[id].num_codecs = 1;
|
||||
links[id].init = rt5650_spk_init;
|
||||
links[id].ops = &sof_rt5682_ops;
|
||||
break;
|
||||
default:
|
||||
dev_err(dev, "invalid amp type %d\n", amp_type);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
id++;
|
||||
}
|
||||
|
||||
/* BT audio offload */
|
||||
if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
|
||||
int port = (sof_rt5682_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>
|
||||
SOF_BT_OFFLOAD_SSP_SHIFT;
|
||||
|
||||
ret = sof_intel_board_set_bt_link(dev, &links[id], id, port);
|
||||
if (ret)
|
||||
return NULL;
|
||||
|
||||
id++;
|
||||
}
|
||||
|
||||
/* HDMI-In SSP */
|
||||
if (sof_rt5682_quirk & SOF_SSP_HDMI_CAPTURE_PRESENT_MASK) {
|
||||
unsigned long hdmi_in_ssp = (sof_rt5682_quirk &
|
||||
SOF_SSP_HDMI_CAPTURE_PRESENT_MASK) >>
|
||||
SOF_NO_OF_HDMI_CAPTURE_SSP_SHIFT;
|
||||
int port = 0;
|
||||
|
||||
for_each_set_bit(port, &hdmi_in_ssp, 32) {
|
||||
ret = sof_intel_board_set_hdmi_in_link(dev, &links[id],
|
||||
id, port);
|
||||
if (ret)
|
||||
return NULL;
|
||||
|
||||
id++;
|
||||
}
|
||||
}
|
||||
|
||||
return links;
|
||||
devm_err:
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sof_audio_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
|
||||
struct snd_soc_dai_link *dai_links;
|
||||
struct sof_card_private *ctx;
|
||||
int ret;
|
||||
|
||||
@ -821,32 +748,13 @@ static int sof_audio_probe(struct platform_device *pdev)
|
||||
|
||||
ctx->ssp_codec = sof_rt5682_quirk & SOF_RT5682_SSP_CODEC_MASK;
|
||||
|
||||
/* compute number of dai links */
|
||||
sof_audio_card_rt5682.num_links = 1 + ctx->dmic_be_num + ctx->hdmi_num;
|
||||
|
||||
if (ctx->amp_type != CODEC_NONE)
|
||||
sof_audio_card_rt5682.num_links++;
|
||||
|
||||
if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
|
||||
if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)
|
||||
ctx->bt_offload_present = true;
|
||||
sof_audio_card_rt5682.num_links++;
|
||||
}
|
||||
|
||||
if (sof_rt5682_quirk & SOF_SSP_HDMI_CAPTURE_PRESENT_MASK)
|
||||
sof_audio_card_rt5682.num_links +=
|
||||
hweight32((sof_rt5682_quirk & SOF_SSP_HDMI_CAPTURE_PRESENT_MASK) >>
|
||||
SOF_NO_OF_HDMI_CAPTURE_SSP_SHIFT);
|
||||
|
||||
dai_links = sof_card_dai_links_create(&pdev->dev, ctx->codec_type,
|
||||
ctx->amp_type, ctx->ssp_codec,
|
||||
ctx->ssp_amp, ctx->dmic_be_num,
|
||||
ctx->hdmi_num,
|
||||
ctx->hdmi.idisp_codec,
|
||||
ctx->rt5682.is_legacy_cpu);
|
||||
if (!dai_links)
|
||||
return -ENOMEM;
|
||||
|
||||
sof_audio_card_rt5682.dai_link = dai_links;
|
||||
/* update dai_link */
|
||||
ret = sof_card_dai_links_create(&pdev->dev, &sof_audio_card_rt5682, ctx);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* update codec_conf */
|
||||
switch (ctx->amp_type) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user