All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: linux-sound@vger.kernel.org
Cc: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org,
	Brent Lu <brent.lu@intel.com>,
	Chao Song <chao.song@linux.intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 10/12] ASoC: Intel: sof_rt5682: support ALC1011 on cml boards
Date: Thu, 11 Apr 2024 17:03:45 -0500	[thread overview]
Message-ID: <20240411220347.131267-11-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20240411220347.131267-1-pierre-louis.bossart@linux.intel.com>

From: Brent Lu <brent.lu@intel.com>

For cml boards, ALC1011 speaker amplifier is supported by machine
driver cml_rt1011_rt5682. Use same driver name for backward
compatibility with existing devices on market.

Reviewed-by: Chao Song <chao.song@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/boards/sof_rt5682.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 326d23dd79de..735e07ea62bd 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -606,6 +606,7 @@ static int sof_audio_probe(struct platform_device *pdev)
 {
 	struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
 	struct sof_card_private *ctx;
+	char *card_name;
 	bool is_legacy_cpu = false;
 	int ret;
 
@@ -631,14 +632,27 @@ static int sof_audio_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	if (ctx->codec_type == CODEC_RT5650) {
-		sof_audio_card_rt5682.name = devm_kstrdup(&pdev->dev, "rt5650",
-							  GFP_KERNEL);
+		card_name = devm_kstrdup(&pdev->dev, "rt5650", GFP_KERNEL);
+		if (!card_name)
+			return -ENOMEM;
+
+		sof_audio_card_rt5682.name = card_name;
 
 		/* create speaker dai link also */
 		if (ctx->amp_type == CODEC_NONE)
 			ctx->amp_type = CODEC_RT5650;
 	}
 
+	if (ctx->amp_type == CODEC_RT1011 && soc_intel_is_cml()) {
+		/* backward-compatible with existing cml devices */
+		card_name = devm_kstrdup(&pdev->dev, "cml_rt1011_rt5682",
+					 GFP_KERNEL);
+		if (!card_name)
+			return -ENOMEM;
+
+		sof_audio_card_rt5682.name = card_name;
+	}
+
 	if (is_legacy_cpu) {
 		ctx->rt5682.is_legacy_cpu = true;
 		ctx->dmic_be_num = 0;
-- 
2.40.1


  parent reply	other threads:[~2024-04-11 22:04 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-11 22:03 [PATCH 00/12] ASoC: Intel: updates for 6.10 - part4 Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 01/12] ASoC: Intel: sof_sdw: add missing sof_sdw_rt_amp_init for Realtek multi-function codecs Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 02/12] ASoC: Intel: soc-acpi: add support for HP Omen14 SoundWire configuration Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 03/12] ASoC: Intel: sof_sdw: add JD2 quirk for HP Omen 14 Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 04/12] ASoC: Intel: sof_sdw: add quirk for Dell SKU 0C0F Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 05/12] ASoC: Intel: sof_sdw: remove FOUR_SPEAKER quirks Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 06/12] ASoC: Intel: sof_da7219: mach cleanup for adl boards Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 07/12] ASoC: Intel: sof_da7219: mach cleanup for rpl boards Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 08/12] ASoC: Intel: sof_da7219: add mtl_da7219_def for mtl boards Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 09/12] ASoC: Intel: sof_realtek_common: support 4xALC1011 amplifier Pierre-Louis Bossart
2024-04-11 22:03 ` Pierre-Louis Bossart [this message]
2024-04-11 22:03 ` [PATCH 11/12] ASoC: Intel: cml_rt1011_rt5682: delete driver Pierre-Louis Bossart
2024-04-11 22:03 ` [PATCH 12/12] ASoC: Intel: sof_rt5682: use RT5682S_PLL1 if needed Pierre-Louis Bossart
2024-04-15  2:26 ` [PATCH 00/12] ASoC: Intel: updates for 6.10 - part4 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=20240411220347.131267-11-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=brent.lu@intel.com \
    --cc=broonie@kernel.org \
    --cc=chao.song@linux.intel.com \
    --cc=linux-sound@vger.kernel.org \
    --cc=tiwai@suse.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.