From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
To: lgirdwood@gmail.com, broonie@kernel.org
Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
pierre-louis.bossart@linux.intel.com,
kai.vehmanen@linux.intel.com, ranjani.sridharan@linux.intel.com,
yung-chuan.liao@linux.intel.com, chao.song@linux.intel.com
Subject: [PATCH 08/27] ASoC: Intel: sof_nau8825: use common module for codec link
Date: Mon, 27 Nov 2023 17:26:35 +0200 [thread overview]
Message-ID: <20231127152654.28204-9-peter.ujfalusi@linux.intel.com> (raw)
In-Reply-To: <20231127152654.28204-1-peter.ujfalusi@linux.intel.com>
From: Brent Lu <brent.lu@intel.com>
Use intel_board module for headphone codec DAI link initialization.
Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
sound/soc/intel/boards/sof_nau8825.c | 29 ++++++++--------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
index dc2821a012d4..3aeed23c8d0d 100644
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -226,30 +226,17 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
goto devm_err;
/* codec SSP */
- links[id].name = devm_kasprintf(dev, GFP_KERNEL,
- "SSP%d-Codec", ssp_codec);
- if (!links[id].name)
- goto devm_err;
+ ret = sof_intel_board_set_codec_link(dev, &links[id], id, CODEC_NAU8825,
+ ssp_codec);
+ if (ret)
+ return NULL;
- links[id].id = id;
+ /* codec-specific fields */
links[id].codecs = nau8825_component;
links[id].num_codecs = ARRAY_SIZE(nau8825_component);
- links[id].platforms = platform_component;
- links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].init = sof_nau8825_codec_init;
links[id].exit = sof_nau8825_codec_exit;
links[id].ops = &sof_nau8825_ops;
- links[id].dpcm_playback = 1;
- links[id].dpcm_capture = 1;
- links[id].no_pcm = 1;
- links[id].cpus = &cpus[id];
- links[id].num_cpus = 1;
-
- links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
- "SSP%d Pin",
- ssp_codec);
- if (!links[id].cpus->dai_name)
- goto devm_err;
id++;
@@ -368,7 +355,7 @@ 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, ssp_amp, ssp_codec;
+ int ret, ssp_amp;
ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx)
@@ -396,7 +383,7 @@ static int sof_audio_probe(struct platform_device *pdev)
ssp_amp = (sof_nau8825_quirk & SOF_NAU8825_SSP_AMP_MASK) >>
SOF_NAU8825_SSP_AMP_SHIFT;
- ssp_codec = sof_nau8825_quirk & SOF_NAU8825_SSP_CODEC_MASK;
+ 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;
@@ -408,7 +395,7 @@ static int sof_audio_probe(struct platform_device *pdev)
sof_audio_card_nau8825.num_links++;
dai_links = sof_card_dai_links_create(&pdev->dev, ctx->amp_type,
- ssp_codec, ssp_amp,
+ ctx->ssp_codec, ssp_amp,
ctx->dmic_be_num, ctx->hdmi_num,
ctx->hdmi.idisp_codec);
if (!dai_links)
--
2.43.0
next prev parent reply other threads:[~2023-11-27 15:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 15:26 [PATCH 00/27] ASoC: Intel: Link handling rework and fixes Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 01/27] ASoC: Intel: sof_ssp_amp: remove dead code Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 02/27] ASoC: Intel: sof_maxim_common: add else between 2 if test Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 03/27] ASoC: Intel: sof_maxim_common: check return value Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 04/27] ASoC: Intel: cht_bsw_rt5672: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 05/27] ASoC: Intel: ssp-common: get codec name function Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 06/27] ASoC: Intel: board_helpers: support codec link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 07/27] ASoC: Intel: sof_cs42l42: use common module for codec link Peter Ujfalusi
2023-11-27 15:26 ` Peter Ujfalusi [this message]
2023-11-27 15:26 ` [PATCH 09/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 10/27] ASoC: Intel: board_helpers: support amp link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 11/27] ASoC: Intel: sof_cs42l42: use common module for amp link Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 12/27] ASoC: Intel: sof_nau8825: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 13/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 14/27] ASoC: Intel: sof_ssp_amp: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 15/27] ASoC: Intel: sof_ssp_amp: rename function parameter Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 16/27] ASoC: Intel: board_helpers: support BT offload link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 17/27] ASoC: Intel: sof_cs42l42: use common module for BT offload link Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 18/27] ASoC: Intel: sof_nau8825: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 19/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 20/27] ASoC: Intel: sof_ssp_amp: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 21/27] ASoC: Intel: sof_ssp_amp: simplify HDMI-In quirks Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 22/27] ASoC: Intel: board_helpers: support HDMI-In link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 23/27] ASoC: Intel: sof_rt5682: use common module for HDMI-In link Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 24/27] ASoC: Intel: sof_ssp_amp: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 25/27] ASoC: Intel: board_helpers: support DAI link array generation Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 26/27] ASoC: Intel: sof_nau8825: use common module for DAI link generation Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 27/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-28 13:55 ` [PATCH 00/27] ASoC: Intel: Link handling rework and fixes Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231127152654.28204-9-peter.ujfalusi@linux.intel.com \
--to=peter.ujfalusi@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=chao.song@linux.intel.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-sound@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox