[PATCH] ASoC: sn624x: add support for the SN6245 part ID

[PATCH] ASoC: sn624x: add support for the SN6245 part ID

[Qianghua Wang]

Panther Lake systems such as the MECHREVO YAOSHI report a single Senary
codec on SoundWire link 3 (mfg_id 0x0496, part_id 0x6245, version 0x3).
The SN624x driver, the sdw_utils codec info table and the ACPI match
tables list 0x6242, 0x6244 and 0x6247, but not 0x6245. SOF then logs
"part id 0x6245 is not supported" and falls back to the HDMI-only HDA
machine driver, so the speakers and the headset jack stay silent.

SN6245 is register-compatible with SN6244 for jack, amp and DMIC. Add
the part ID to the SDW driver ID table and the codec info table, and
add MTL, ARL, LNL and PTL match entries. The new entries use
sof-<platform>-dummy.tplg plus function topologies, the same as the
other SN624x parts. PTL matches link 3 / version 3; MTL, ARL and LNL
match link 0, following the existing SN6242/SN6244 entries.

Link: https://github.com/thesofproject/linux/issues/6012
Signed-off-by: Qianghua Wang <qianghua.wang@senarytech.com>
---
 sound/soc/codecs/sn624x-sdca-sdw.c            |  2 +
 .../intel/common/soc-acpi-intel-arl-match.c   |  9 +++
 .../intel/common/soc-acpi-intel-lnl-match.c   |  9 +++
 .../intel/common/soc-acpi-intel-mtl-match.c   |  9 +++
 .../intel/common/soc-acpi-intel-ptl-match.c   |  9 +++
 sound/soc/sdw_utils/soc_sdw_utils.c           | 56 ++++++++++++++++++-
 6 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/sn624x-sdca-sdw.c b/sound/soc/codecs/sn624x-sdca-sdw.c
index c9e690482..1d4e5f27a 100644
--- a/sound/soc/codecs/sn624x-sdca-sdw.c
+++ b/sound/soc/codecs/sn624x-sdca-sdw.c
@@ -1771,6 +1771,8 @@ static void sn624x_sdca_sdw_remove(struct sdw_slave *slave)
 static const struct sdw_device_id sn624x_sdca_id[] = {
 	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6242, 0x3, 0x1, 0),
 	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6244, 0x3, 0x1, 0),
+	/* SN6245 is register-compatible with SN6244 (jack/amp/dmic). */
+	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6245, 0x3, 0x1, 0),
 	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6247, 0x3, 0x1, 0),
 	{ }
 };
diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
index 1d5f6677b..2fe33280b 100644
--- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
@@ -653,9 +653,11 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 
 SN624X_ARL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
 SN624X_ARL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
+SN624X_ARL_SINGLE_ADR(sn6245_single_adr, 0x0000000496624501ull);
 
 SN624X_ARL_LINK(arl_link_sn6242, sn6242_single_adr);
 SN624X_ARL_LINK(arl_link_sn6244, sn6244_single_adr);
+SN624X_ARL_LINK(arl_link_sn6245, sn6245_single_adr);
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
 	{
@@ -779,6 +781,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-arl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(0),
+		.links = arl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-arl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_sdw_machines);
diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
index a9fef394f..5e90e17a9 100644
--- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@ -738,9 +738,11 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 
 SN624X_LNL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
 SN624X_LNL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
+SN624X_LNL_SINGLE_ADR(sn6245_single_adr, 0x0000000496624501ull);
 
 SN624X_LNL_LINK(lnl_link_sn6242, sn6242_single_adr);
 SN624X_LNL_LINK(lnl_link_sn6244, sn6244_single_adr);
+SN624X_LNL_LINK(lnl_link_sn6245, sn6245_single_adr);
 
 /* this table is used when there is no I2S codec present */
 struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
@@ -877,6 +879,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-lnl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(0),
+		.links = lnl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-lnl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_lnl_sdw_machines);
diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index 704b4e0d2..10c38bc4f 100644
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -1349,9 +1349,11 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 
 SN624X_MTL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
 SN624X_MTL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
+SN624X_MTL_SINGLE_ADR(sn6245_single_adr, 0x0000000496624501ull);
 
 SN624X_MTL_LINK(mtl_link_sn6242, sn6242_single_adr);
 SN624X_MTL_LINK(mtl_link_sn6244, sn6244_single_adr);
+SN624X_MTL_LINK(mtl_link_sn6245, sn6245_single_adr);
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
 	/* mockup tests need to be first */
@@ -1574,6 +1576,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-mtl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(0),
+		.links = mtl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-mtl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);
diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
index a5896796a..467709def 100644
--- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -495,10 +495,12 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 
 SN624X_PTL_SINGLE_ADR(sn6242_single_adr, 0x0003300496624201ull);
 SN624X_PTL_SINGLE_ADR(sn6244_single_adr, 0x0003300496624401ull);
+SN624X_PTL_SINGLE_ADR(sn6245_single_adr, 0x0003300496624501ull);
 SN624X_PTL_SINGLE_ADR(sn6247_single_adr, 0x0003300496624701ull);
 
 SN624X_PTL_LINK(ptl_link_sn6242, sn6242_single_adr);
 SN624X_PTL_LINK(ptl_link_sn6244, sn6244_single_adr);
+SN624X_PTL_LINK(ptl_link_sn6245, sn6245_single_adr);
 SN624X_PTL_LINK(ptl_link_sn6247, sn6247_single_adr);
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
@@ -609,6 +611,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(3),
+		.links = ptl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6247,
diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index 7a19de75f..fefc4d7f5 100644
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -1492,8 +1492,9 @@ struct asoc_sdw_codec_info codec_info_list[] = {
 		.dai_num = 1,
 	},
 	/*
-	 * Senary SN6242/6244/6247: same SDCA jack/amp/mic topology; only part_id
-	 * differs. name_prefix stays "sn624x" for UCM/DAI naming.
+	 * Senary SN6242/6244/6245/6247: same SDCA jack/amp/mic topology; only
+	 * part_id differs. SN6245 is register-compatible with SN6244.
+	 * name_prefix stays "sn624x" for UCM/DAI naming.
 	 */
 	{
 		.vendor_id = 0x0496,
@@ -1546,6 +1547,57 @@ struct asoc_sdw_codec_info codec_info_list[] = {
 		},
 		.dai_num = 3,
 	},
+	{
+		.vendor_id = 0x0496,
+		.part_id = 0x6245,
+		.name_prefix = "sn624x",
+		.ignore_internal_dmic = true,
+		.dais = {
+			{
+				.direction = {true, true},
+				.dai_name = "sn624x-sdca-aif",
+				.dai_type = SOC_SDW_DAI_TYPE_JACK,
+				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
+				.init = asoc_sdw_senary_sdca_jack_init,
+				.exit = asoc_sdw_senary_sdca_jack_exit,
+				.rtd_init = asoc_sdw_senary_sdca_jack_rtd_init,
+				.controls = generic_jack_controls,
+				.num_controls = ARRAY_SIZE(generic_jack_controls),
+				.widgets = generic_jack_widgets,
+				.num_widgets = ARRAY_SIZE(generic_jack_widgets),
+			},
+			{
+				.direction = {true, false},
+				.dai_name = "sn624x-sdca-aif2",
+				.component_name = "sn624x",
+				.dai_type = SOC_SDW_DAI_TYPE_AMP,
+				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
+				.init = asoc_sdw_senary_amp_init,
+				.exit = asoc_sdw_senary_amp_exit,
+				.rtd_init = asoc_sdw_senary_sdca_spk_rtd_init,
+				.controls = generic_spk_controls,
+				.num_controls = ARRAY_SIZE(generic_spk_controls),
+				.widgets = generic_spk_widgets,
+				.num_widgets = ARRAY_SIZE(generic_spk_widgets),
+				.quirk = SOC_SDW_CODEC_SPKR,
+				.quirk_exclude = true,
+			},
+			{
+				.direction = {false, true},
+				.dai_name = "sn624x-sdca-aif3",
+				.dai_type = SOC_SDW_DAI_TYPE_MIC,
+				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
+				.rtd_init = asoc_sdw_senary_dmic_rtd_init,
+				.widgets = sn624x_dmic_widgets,
+				.num_widgets = ARRAY_SIZE(sn624x_dmic_widgets),
+				.controls = sn624x_dmic_controls,
+				.num_controls = ARRAY_SIZE(sn624x_dmic_controls),
+				.quirk = SOC_SDW_CODEC_MIC,
+				.quirk_exclude = true,
+			},
+		},
+		.dai_num = 3,
+	},
 	{
 		.vendor_id = 0x0496,
 		.part_id = 0x6247,
-- 
2.43.0

Re: [PATCH] ASoC: sn624x: add support for the SN6245 part ID

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] ASoC: Intel: soc-acpi: wrong SoundWire version 0x0 for SN6245
  on ARL/LNL/MTL
--

commit b10667bc93275c45d1fc140d10749355be52e7d6
Author: Qianghua Wang <qianghua.wang@senarytech.com>

ASoC: sn624x: add support for the SN6245 part ID

This commit adds the SN6245 part ID (0x6245) to the SN624x SoundWire
driver ID table, the sdw_utils codec info table, and the Intel SoundWire
ACPI match tables for Arrow Lake, Lunar Lake, Meteor Lake, and Panther
Lake.

Link: https://github.com/thesofproject/linux/issues/6012

> diff --git a/sound/soc/codecs/sn624x-sdca-sdw.c b/sound/soc/codecs/sn624x-sdca-sdw.c
> index 65ea90e440008..079a96bce94e7 100644
> --- a/sound/soc/codecs/sn624x-sdca-sdw.c
> +++ b/sound/soc/codecs/sn624x-sdca-sdw.c
> @@ -1769,6 +1769,8 @@ static void sn624x_sdca_sdw_remove(struct sdw_slave *slave)
>  static const struct sdw_device_id sn624x_sdca_id[] = {
>  	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6242, 0x3, 0x1, 0),
>  	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6244, 0x3, 0x1, 0),
> +	/* SN6245 is register-compatible with SN6244 (jack/amp/dmic). */
> +	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6245, 0x3, 0x1, 0),
>  	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6247, 0x3, 0x1, 0),
>  	{ }
>  };
> diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
> index 1d5f6677bfd87..2fe33280baad0 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
> @@ -653,9 +653,11 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
>  
>  SN624X_ARL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
>  SN624X_ARL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
> +SN624X_ARL_SINGLE_ADR(sn6245_single_adr, 0x0000000496624501ull);

[ ... ]

> diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
> index a9fef394f176f..5e90e17a97969 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
> @@ -738,9 +738,11 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
>  
>  SN624X_LNL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
>  SN624X_LNL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
> +SN624X_LNL_SINGLE_ADR(sn6245_single_adr, 0x0000000496624501ull);

[ ... ]

> diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
> index 704b4e0d205e2..10c38bc4fb9d6 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
> @@ -1349,9 +1349,11 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
>  
>  SN624X_MTL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
>  SN624X_MTL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
> +SN624X_MTL_SINGLE_ADR(sn6245_single_adr, 0x0000000496624501ull);

[Severity: Medium]
Should sn6245_single_adr on ARL, LNL, and MTL encode SoundWire version
0x3 (0x0000300496624501ull) instead of 0x0 (0x0000000496624501ull)?

sn624x_sdca_id[] registers SN6245 with sdw_version 0x3, which
sdw_get_device_id() requires in bits 47:44 of the ACPI _ADR before binding
the codec driver.  During machine selection, hda_sdw_machine_select() ->
snd_soc_acpi_sdw_link_slaves_found() compares peripheral->id.sdw_version
against SDW_VERSION(adr) without treating 0 as a wildcard:

sound/soc/soc-acpi.c:snd_soc_acpi_sdw_link_slaves_found() {
	...
		version = SDW_VERSION(adr);
	...
			if (peripheral->bus->link_id == link_id &&
			    peripheral->id.part_id == part_id &&
			    peripheral->id.mfg_id == mfg_id &&
			    peripheral->id.sdw_version == version)
				reported_part_count++;
	...
}

Because 0x0 != 0x3, these ARL, LNL, and MTL entries cannot match an active
SN6245 codec, causing ARL and MTL systems to fail machine selection and
fall back to the HDMI-only HDA machine driver.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261110032012.711191-1-qianghua.wang@senarytech.com?part=1

[PATCH v2] ASoC: sn624x: add support for the SN6245 part ID

[Qianghua Wang]

Panther Lake systems such as the MECHREVO YAOSHI report a single Senary
codec on SoundWire link 3 (mfg_id 0x0496, part_id 0x6245, version 0x3).
The SN624x driver, the sdw_utils codec info table and the ACPI match
tables list 0x6242, 0x6244 and 0x6247, but not 0x6245. SOF then logs
"part id 0x6245 is not supported" and falls back to the HDMI-only HDA
machine driver, so the speakers and the headset jack stay silent.

SN6245 is register-compatible with SN6244 for jack, amp and DMIC. Add
the part ID to the SDW driver ID table and the codec info table, and
add MTL, ARL, LNL and PTL match entries. The new entries use
sof-<platform>-dummy.tplg plus function topologies, the same as the
other SN624x parts.

PTL matches link 3. MTL, ARL and LNL stay on link 0. On every platform
the _ADR version nibble is 0x3, matching the silicon SoundWire version.
snd_soc_acpi_sdw_link_slaves_found() does not treat version 0 as a
wildcard, so the existing MTL, ARL and LNL SN6242 and SN6244 entries
are corrected the same way.

Link: https://github.com/thesofproject/linux/issues/6012
Signed-off-by: Qianghua Wang <qianghua.wang@senarytech.com>
---
Changes in v2:
- Encode SoundWire version 0x3 in the ARL, LNL and MTL _ADR values
  (0x0000300496624x01). Version 0 is not a wildcard in
  snd_soc_acpi_sdw_link_slaves_found(), so those entries never matched
  a SN624x codec. Link stays 0. PTL was already link 3 / version 3.
- Correct the existing SN6242 and SN6244 entries on ARL, LNL and MTL
  the same way.

 sound/soc/codecs/sn624x-sdca-sdw.c            |  2 +
 .../intel/common/soc-acpi-intel-arl-match.c   | 18 ++++--
 .../intel/common/soc-acpi-intel-lnl-match.c   | 18 ++++--
 .../intel/common/soc-acpi-intel-mtl-match.c   | 18 ++++--
 .../intel/common/soc-acpi-intel-ptl-match.c   |  9 +++
 sound/soc/sdw_utils/soc_sdw_utils.c           | 56 ++++++++++++++++++-
 6 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/sound/soc/codecs/sn624x-sdca-sdw.c b/sound/soc/codecs/sn624x-sdca-sdw.c
index c9e690482..1d4e5f27a 100644
--- a/sound/soc/codecs/sn624x-sdca-sdw.c
+++ b/sound/soc/codecs/sn624x-sdca-sdw.c
@@ -1771,6 +1771,8 @@ static void sn624x_sdca_sdw_remove(struct sdw_slave *slave)
 static const struct sdw_device_id sn624x_sdca_id[] = {
 	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6242, 0x3, 0x1, 0),
 	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6244, 0x3, 0x1, 0),
+	/* SN6245 is register-compatible with SN6244 (jack/amp/dmic). */
+	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6245, 0x3, 0x1, 0),
 	SDW_SLAVE_ENTRY_EXT(0x0496, 0x6247, 0x3, 0x1, 0),
 	{ }
 };
diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
index 1d5f6677b..bddeb1225 100644
--- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
@@ -603,8 +603,9 @@ EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_machines);
 
 /*
  * Senary SN624x on Arrow Lake: one multi-function device on link 0.
- * Separate mach entries per part ID (adr_d[] is AND, not OR). Amp endpoint
- * is aggregated like the generic SOC_SDW_DAI_TYPE_AMP shape from
+ * Separate mach entries per part ID (adr_d[] is AND, not OR). ADR version
+ * nibble 0x3 matches the silicon SoundWire version. Amp endpoint is
+ * aggregated like the generic SOC_SDW_DAI_TYPE_AMP shape from
  * find_acpi_adr_device().
  */
 static const struct snd_soc_acpi_endpoint sn624x_endpoints[] = {
@@ -651,11 +652,13 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 	{}								\
 }
 
-SN624X_ARL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
-SN624X_ARL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
+SN624X_ARL_SINGLE_ADR(sn6242_single_adr, 0x0000300496624201ull);
+SN624X_ARL_SINGLE_ADR(sn6244_single_adr, 0x0000300496624401ull);
+SN624X_ARL_SINGLE_ADR(sn6245_single_adr, 0x0000300496624501ull);
 
 SN624X_ARL_LINK(arl_link_sn6242, sn6242_single_adr);
 SN624X_ARL_LINK(arl_link_sn6244, sn6244_single_adr);
+SN624X_ARL_LINK(arl_link_sn6245, sn6245_single_adr);
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
 	{
@@ -779,6 +782,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-arl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(0),
+		.links = arl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-arl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_sdw_machines);
diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
index a9fef394f..ef021771e 100644
--- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@ -688,8 +688,9 @@ static const struct snd_soc_acpi_link_adr lnl_sdw_rt712_vb_l2_rt1320_l1[] = {
 
 /*
  * Senary SN624x on Lunar Lake: one multi-function device on link 0.
- * Separate mach entries per part ID (adr_d[] is AND, not OR). Amp endpoint
- * is aggregated like the generic SOC_SDW_DAI_TYPE_AMP shape from
+ * Separate mach entries per part ID (adr_d[] is AND, not OR). ADR version
+ * nibble 0x3 matches the silicon SoundWire version. Amp endpoint is
+ * aggregated like the generic SOC_SDW_DAI_TYPE_AMP shape from
  * find_acpi_adr_device().
  */
 static const struct snd_soc_acpi_endpoint sn624x_endpoints[] = {
@@ -736,11 +737,13 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 	{}								\
 }
 
-SN624X_LNL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
-SN624X_LNL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
+SN624X_LNL_SINGLE_ADR(sn6242_single_adr, 0x0000300496624201ull);
+SN624X_LNL_SINGLE_ADR(sn6244_single_adr, 0x0000300496624401ull);
+SN624X_LNL_SINGLE_ADR(sn6245_single_adr, 0x0000300496624501ull);
 
 SN624X_LNL_LINK(lnl_link_sn6242, sn6242_single_adr);
 SN624X_LNL_LINK(lnl_link_sn6244, sn6244_single_adr);
+SN624X_LNL_LINK(lnl_link_sn6245, sn6245_single_adr);
 
 /* this table is used when there is no I2S codec present */
 struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
@@ -877,6 +880,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-lnl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(0),
+		.links = lnl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-lnl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_lnl_sdw_machines);
diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index 704b4e0d2..1b4483c7b 100644
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -1299,8 +1299,9 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
 
 /*
  * Senary SN624x on Meteor Lake: one multi-function device on link 0.
- * Separate mach entries per part ID (adr_d[] is AND, not OR). Amp endpoint
- * is aggregated like the generic SOC_SDW_DAI_TYPE_AMP shape from
+ * Separate mach entries per part ID (adr_d[] is AND, not OR). ADR version
+ * nibble 0x3 matches the silicon SoundWire version. Amp endpoint is
+ * aggregated like the generic SOC_SDW_DAI_TYPE_AMP shape from
  * find_acpi_adr_device().
  */
 static const struct snd_soc_acpi_endpoint sn624x_endpoints[] = {
@@ -1347,11 +1348,13 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 	{}								\
 }
 
-SN624X_MTL_SINGLE_ADR(sn6242_single_adr, 0x0000000496624201ull);
-SN624X_MTL_SINGLE_ADR(sn6244_single_adr, 0x0000000496624401ull);
+SN624X_MTL_SINGLE_ADR(sn6242_single_adr, 0x0000300496624201ull);
+SN624X_MTL_SINGLE_ADR(sn6244_single_adr, 0x0000300496624401ull);
+SN624X_MTL_SINGLE_ADR(sn6245_single_adr, 0x0000300496624501ull);
 
 SN624X_MTL_LINK(mtl_link_sn6242, sn6242_single_adr);
 SN624X_MTL_LINK(mtl_link_sn6244, sn6244_single_adr);
+SN624X_MTL_LINK(mtl_link_sn6245, sn6245_single_adr);
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
 	/* mockup tests need to be first */
@@ -1574,6 +1577,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-mtl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(0),
+		.links = mtl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-mtl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);
diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
index a5896796a..467709def 100644
--- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -495,10 +495,12 @@ static const struct snd_soc_acpi_link_adr _sym[] = {			\
 
 SN624X_PTL_SINGLE_ADR(sn6242_single_adr, 0x0003300496624201ull);
 SN624X_PTL_SINGLE_ADR(sn6244_single_adr, 0x0003300496624401ull);
+SN624X_PTL_SINGLE_ADR(sn6245_single_adr, 0x0003300496624501ull);
 SN624X_PTL_SINGLE_ADR(sn6247_single_adr, 0x0003300496624701ull);
 
 SN624X_PTL_LINK(ptl_link_sn6242, sn6242_single_adr);
 SN624X_PTL_LINK(ptl_link_sn6244, sn6244_single_adr);
+SN624X_PTL_LINK(ptl_link_sn6245, sn6245_single_adr);
 SN624X_PTL_LINK(ptl_link_sn6247, sn6247_single_adr);
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
@@ -609,6 +611,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
+	{
+		.link_mask = BIT(3),
+		.links = ptl_link_sn6245,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
+		.get_function_tplg_files = sof_sdw_get_tplg_files,
+	},
 	{
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6247,
diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index 7a19de75f..fefc4d7f5 100644
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -1492,8 +1492,9 @@ struct asoc_sdw_codec_info codec_info_list[] = {
 		.dai_num = 1,
 	},
 	/*
-	 * Senary SN6242/6244/6247: same SDCA jack/amp/mic topology; only part_id
-	 * differs. name_prefix stays "sn624x" for UCM/DAI naming.
+	 * Senary SN6242/6244/6245/6247: same SDCA jack/amp/mic topology; only
+	 * part_id differs. SN6245 is register-compatible with SN6244.
+	 * name_prefix stays "sn624x" for UCM/DAI naming.
 	 */
 	{
 		.vendor_id = 0x0496,
@@ -1546,6 +1547,57 @@ struct asoc_sdw_codec_info codec_info_list[] = {
 		},
 		.dai_num = 3,
 	},
+	{
+		.vendor_id = 0x0496,
+		.part_id = 0x6245,
+		.name_prefix = "sn624x",
+		.ignore_internal_dmic = true,
+		.dais = {
+			{
+				.direction = {true, true},
+				.dai_name = "sn624x-sdca-aif",
+				.dai_type = SOC_SDW_DAI_TYPE_JACK,
+				.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
+				.init = asoc_sdw_senary_sdca_jack_init,
+				.exit = asoc_sdw_senary_sdca_jack_exit,
+				.rtd_init = asoc_sdw_senary_sdca_jack_rtd_init,
+				.controls = generic_jack_controls,
+				.num_controls = ARRAY_SIZE(generic_jack_controls),
+				.widgets = generic_jack_widgets,
+				.num_widgets = ARRAY_SIZE(generic_jack_widgets),
+			},
+			{
+				.direction = {true, false},
+				.dai_name = "sn624x-sdca-aif2",
+				.component_name = "sn624x",
+				.dai_type = SOC_SDW_DAI_TYPE_AMP,
+				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
+				.init = asoc_sdw_senary_amp_init,
+				.exit = asoc_sdw_senary_amp_exit,
+				.rtd_init = asoc_sdw_senary_sdca_spk_rtd_init,
+				.controls = generic_spk_controls,
+				.num_controls = ARRAY_SIZE(generic_spk_controls),
+				.widgets = generic_spk_widgets,
+				.num_widgets = ARRAY_SIZE(generic_spk_widgets),
+				.quirk = SOC_SDW_CODEC_SPKR,
+				.quirk_exclude = true,
+			},
+			{
+				.direction = {false, true},
+				.dai_name = "sn624x-sdca-aif3",
+				.dai_type = SOC_SDW_DAI_TYPE_MIC,
+				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
+				.rtd_init = asoc_sdw_senary_dmic_rtd_init,
+				.widgets = sn624x_dmic_widgets,
+				.num_widgets = ARRAY_SIZE(sn624x_dmic_widgets),
+				.controls = sn624x_dmic_controls,
+				.num_controls = ARRAY_SIZE(sn624x_dmic_controls),
+				.quirk = SOC_SDW_CODEC_MIC,
+				.quirk_exclude = true,
+			},
+		},
+		.dai_num = 3,
+	},
 	{
 		.vendor_id = 0x0496,
 		.part_id = 0x6247,
-- 
2.43.0

Re: [PATCH v2] ASoC: sn624x: add support for the SN6245 part ID

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 781 bytes --]

On Tue, Nov 10, 2026 at 11:47:36AM +0800, Qianghua Wang wrote:
> Panther Lake systems such as the MECHREVO YAOSHI report a single Senary
> codec on SoundWire link 3 (mfg_id 0x0496, part_id 0x6245, version 0x3).
> The SN624x driver, the sdw_utils codec info table and the ACPI match
> tables list 0x6242, 0x6244 and 0x6247, but not 0x6245. SOF then logs
> "part id 0x6245 is not supported" and falls back to the HDMI-only HDA
> machine driver, so the speakers and the headset jack stay silent.

Please don't send new patches in reply to old patches or serieses, this
makes it harder for both people and tools to understand what is going
on - it can bury things in mailboxes and make it difficult to keep track
of what current patches are, both for the new patches and the old ones.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]