mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-20 12:21:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: Intel: sof_nau8825: use common module for DAI link generation

Browse Source 
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-27-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Brent Lu
2023-11-27 17:26:53 +02:00
committed by Mark Brown
parent a6881210f1
commit 5da85a3523
1 changed files with 49 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
sound/soc/intel/boards/sof_nau8825.c
View File

@@ -200,123 +200,67 @@ static struct snd_soc_dai_link_component nau8825_component[] = {
}
};
static struct snd_soc_dai_link *
sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
int ssp_codec, int ssp_amp, int dmic_be_num,
int hdmi_num, bool idisp_codec)
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_nau8825.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_NAU8825,
ssp_codec);
ret = sof_intel_board_set_dai_link(dev, card, ctx);
if (ret)
return NULL;
return ret;
/* codec-specific fields */
links[id].codecs = nau8825_component;
links[id].num_codecs = ARRAY_SIZE(nau8825_component);
links[id].init = sof_nau8825_codec_init;
links[id].exit = sof_nau8825_codec_exit;
links[id].ops = &sof_nau8825_ops;
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++;
if (!ctx->codec_link) {
dev_err(dev, "codec link not available");
return -EINVAL;
}
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;
/* codec-specific fields for headphone codec */
ctx->codec_link->codecs = nau8825_component;
ctx->codec_link->num_codecs = ARRAY_SIZE(nau8825_component);
ctx->codec_link->init = sof_nau8825_codec_init;
ctx->codec_link->exit = sof_nau8825_codec_exit;
ctx->codec_link->ops = &sof_nau8825_ops;
id++;
if (ctx->amp_type == CODEC_NONE)
return 0;
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_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_NAU8318:
nau8318_set_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;
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_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_NAU8318:
nau8318_set_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;
default:
dev_err(dev, "invalid amp type %d\n", amp_type);
return NULL;
}
id++;
}
/* BT audio offload */
if (sof_nau8825_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
int port = (sof_nau8825_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++;
}
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;
@@ -352,25 +296,13 @@ static int sof_audio_probe(struct platform_device *pdev)
ctx->ssp_codec = sof_nau8825_quirk & SOF_NAU8825_SSP_CODEC_MASK;
/* compute number of dai links */
sof_audio_card_nau8825.num_links = 1 + ctx->dmic_be_num + ctx->hdmi_num;
if (ctx->amp_type != CODEC_NONE)
sof_audio_card_nau8825.num_links++;
if (sof_nau8825_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
if (sof_nau8825_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)
ctx->bt_offload_present = true;
sof_audio_card_nau8825.num_links++;
}
dai_links = sof_card_dai_links_create(&pdev->dev, ctx->amp_type,
ctx->ssp_codec, ctx->ssp_amp,
ctx->dmic_be_num, ctx->hdmi_num,
ctx->hdmi.idisp_codec);
if (!dai_links)
return -ENOMEM;
sof_audio_card_nau8825.dai_link = dai_links;
/* update dai_link */
ret = sof_card_dai_links_create(&pdev->dev, &sof_audio_card_nau8825, ctx);
if (ret)
return ret;
/* update codec_conf */
switch (ctx->amp_type) {