All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support
@ 2021-11-05  2:26 Bard Liao
  2021-11-05  2:26 ` [PATCH 1/9] ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product Bard Liao
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

This series adds configurations for Dell ADL products.

Gongjun Song (9):
  ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product
  ASoC: Intel: soc-acpi: add SKU 0AF3 SoundWire configuration
  ASoC: Intel: sof_sdw: Add support for SKU 0B00 and 0B01 products
  ASoC: Intel: sof_sdw: Add support for SKU 0B11 product
  ASoC: Intel: sof_sdw: Add support for SKU 0B13 product
  ASoC: Intel: soc-acpi: add SKU 0B13 SoundWire configuration
  ASoC: Intel: sof_sdw: Add support for SKU 0B29 product
  ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration
  ASoC: Intel: sof_sdw: Add support for SKU 0B12 product

 sound/soc/intel/boards/sof_sdw.c              |  69 ++++++++++++
 .../intel/common/soc-acpi-intel-adl-match.c   | 105 ++++++++++++++++++
 2 files changed, 174 insertions(+)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/9] ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 2/9] ASoC: Intel: soc-acpi: add SKU 0AF3 SoundWire configuration Bard Liao
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

This product supports SoundWire capture from local microphones
and two SoundWire amplifiers(no headset codec).

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index f10496206cee..584f9f2db207 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -248,6 +248,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 					SOF_BT_OFFLOAD_SSP(2) |
 					SOF_SSP_BT_OFFLOAD_PRESENT),
 	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0AF3"),
+		},
+		/* No Jack */
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					SOF_SDW_FOUR_SPK),
+	},
 	{}
 };
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/9] ASoC: Intel: soc-acpi: add SKU 0AF3 SoundWire configuration
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
  2021-11-05  2:26 ` [PATCH 1/9] ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 3/9] ASoC: Intel: sof_sdw: Add support for SKU 0B00 and 0B01 products Bard Liao
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

New product audio hardware configuration is rt714 on link0,
two rt1316s on link1 and link2

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 .../intel/common/soc-acpi-intel-adl-match.c   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 06f503452aa5..d8ae94d39d57 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -209,6 +209,25 @@ static const struct snd_soc_acpi_link_adr adl_sdca_3_in_1[] = {
 	{}
 };
 
+static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link12_rt714_link0[] = {
+	{
+		.mask = BIT(1),
+		.num_adr = ARRAY_SIZE(rt1316_1_group1_adr),
+		.adr_d = rt1316_1_group1_adr,
+	},
+	{
+		.mask = BIT(2),
+		.num_adr = ARRAY_SIZE(rt1316_2_group1_adr),
+		.adr_d = rt1316_2_group1_adr,
+	},
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(rt714_0_adr),
+		.adr_d = rt714_0_adr,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link2_rt714_link0[] = {
 	{
 		.mask = BIT(2),
@@ -339,6 +358,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l13-rt714-l2.tplg",
 	},
+	{
+		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
+		.links = adl_sdw_rt1316_link12_rt714_link0,
+		.drv_name = "sof_sdw",
+		.sof_fw_filename = "sof-adl.ri",
+		.sof_tplg_filename = "sof-adl-rt1316-l12-rt714-l0.tplg",
+	},
 	{
 		.link_mask = 0x5, /* 2 active links required */
 		.links = adl_sdw_rt1316_link2_rt714_link0,
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 3/9] ASoC: Intel: sof_sdw: Add support for SKU 0B00 and 0B01 products
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
  2021-11-05  2:26 ` [PATCH 1/9] ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product Bard Liao
  2021-11-05  2:26 ` [PATCH 2/9] ASoC: Intel: soc-acpi: add SKU 0AF3 SoundWire configuration Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 4/9] ASoC: Intel: sof_sdw: Add support for SKU 0B11 product Bard Liao
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

Both products support a SoundWire headset codec, SoundWire
capture from local microphones and two SoundWire amplifiers.

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 584f9f2db207..55c3e5935585 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -258,6 +258,26 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
 					SOF_SDW_FOUR_SPK),
 	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B00")
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					RT711_JD2 |
+					SOF_SDW_FOUR_SPK),
+	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B01")
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					RT711_JD2 |
+					SOF_SDW_FOUR_SPK),
+	},
 	{}
 };
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 4/9] ASoC: Intel: sof_sdw: Add support for SKU 0B11 product
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
                   ` (2 preceding siblings ...)
  2021-11-05  2:26 ` [PATCH 3/9] ASoC: Intel: sof_sdw: Add support for SKU 0B00 and 0B01 products Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 5/9] ASoC: Intel: sof_sdw: Add support for SKU 0B13 product Bard Liao
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

This product supports a SoundWire headset codec, SoundWire
capture from local microphones and two SoundWire amplifiers.

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 55c3e5935585..d0bea028b9b7 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -278,6 +278,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 					RT711_JD2 |
 					SOF_SDW_FOUR_SPK),
 	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B11")
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					RT711_JD2 |
+					SOF_SDW_FOUR_SPK),
+	},
 	{}
 };
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 5/9] ASoC: Intel: sof_sdw: Add support for SKU 0B13 product
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
                   ` (3 preceding siblings ...)
  2021-11-05  2:26 ` [PATCH 4/9] ASoC: Intel: sof_sdw: Add support for SKU 0B11 product Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 6/9] ASoC: Intel: soc-acpi: add SKU 0B13 SoundWire configuration Bard Liao
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

This product supports SoundWire capture from local microphones
and one SoundWire amplifier(no headset codec).

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index d0bea028b9b7..25cdd61f09a8 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -288,6 +288,15 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 					RT711_JD2 |
 					SOF_SDW_FOUR_SPK),
 	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B13"),
+		},
+		/* No Jack */
+		.driver_data = (void *)SOF_SDW_TGL_HDMI,
+	},
 	{}
 };
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 6/9] ASoC: Intel: soc-acpi: add SKU 0B13 SoundWire configuration
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
                   ` (4 preceding siblings ...)
  2021-11-05  2:26 ` [PATCH 5/9] ASoC: Intel: sof_sdw: Add support for SKU 0B13 product Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 7/9] ASoC: Intel: sof_sdw: Add support for SKU 0B29 product Bard Liao
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

Product audio hardware configuration is rt1316 on link2,
rt714 on link 3.

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 .../intel/common/soc-acpi-intel-adl-match.c   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index d8ae94d39d57..3440c0fa31fa 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -228,6 +228,20 @@ static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link12_rt714_link0[] =
 	{}
 };
 
+static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link2_rt714_link3[] = {
+	{
+		.mask = BIT(2),
+		.num_adr = ARRAY_SIZE(rt1316_2_single_adr),
+		.adr_d = rt1316_2_single_adr,
+	},
+	{
+		.mask = BIT(3),
+		.num_adr = ARRAY_SIZE(rt714_3_adr),
+		.adr_d = rt714_3_adr,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link2_rt714_link0[] = {
 	{
 		.mask = BIT(2),
@@ -358,6 +372,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l13-rt714-l2.tplg",
 	},
+	{
+		.link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */
+		.links = adl_sdw_rt1316_link2_rt714_link3,
+		.drv_name = "sof_sdw",
+		.sof_fw_filename = "sof-adl.ri",
+		.sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg",
+	},
 	{
 		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
 		.links = adl_sdw_rt1316_link12_rt714_link0,
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 7/9] ASoC: Intel: sof_sdw: Add support for SKU 0B29 product
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
                   ` (5 preceding siblings ...)
  2021-11-05  2:26 ` [PATCH 6/9] ASoC: Intel: soc-acpi: add SKU 0B13 SoundWire configuration Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 8/9] ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration Bard Liao
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

This product supports a SoundWire headset codec, SoundWire
capture from local microphones and two SoundWire amplifiers.

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 25cdd61f09a8..bfbdda323b87 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -297,6 +297,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 		/* No Jack */
 		.driver_data = (void *)SOF_SDW_TGL_HDMI,
 	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B29"),
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					RT711_JD2 |
+					SOF_SDW_FOUR_SPK),
+	},
 	{}
 };
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 8/9] ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
                   ` (6 preceding siblings ...)
  2021-11-05  2:26 ` [PATCH 7/9] ASoC: Intel: sof_sdw: Add support for SKU 0B29 product Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05  2:26 ` [PATCH 9/9] ASoC: Intel: sof_sdw: Add support for SKU 0B12 product Bard Liao
  2021-11-05 20:14 ` [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Mark Brown
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

Product audio hardware configuration is rt711 on link2,
two rt1316s on link0 and link1, rt714 on link 3.

Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 .../intel/common/soc-acpi-intel-adl-match.c   | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 3440c0fa31fa..b61a778a9d26 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -74,6 +74,15 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
 	}
 };
 
+static const struct snd_soc_acpi_adr_device rt711_sdca_2_adr[] = {
+	{
+		.adr = 0x000230025D071101ull,
+		.num_endpoints = 1,
+		.endpoints = &single_endpoint,
+		.name_prefix = "rt711"
+	}
+};
+
 static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = {
 	{
 		.adr = 0x000131025D131601ull, /* unique ID is set for some reason */
@@ -101,6 +110,24 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = {
 	}
 };
 
+static const struct snd_soc_acpi_adr_device rt1316_0_group2_adr[] = {
+	{
+		.adr = 0x000031025D131601ull,
+		.num_endpoints = 1,
+		.endpoints = &spk_l_endpoint,
+		.name_prefix = "rt1316-1"
+	}
+};
+
+static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = {
+	{
+		.adr = 0x000130025D131601ull,
+		.num_endpoints = 1,
+		.endpoints = &spk_r_endpoint,
+		.name_prefix = "rt1316-2"
+	}
+};
+
 static const struct snd_soc_acpi_adr_device rt1316_2_single_adr[] = {
 	{
 		.adr = 0x000230025D131601ull,
@@ -209,6 +236,30 @@ static const struct snd_soc_acpi_link_adr adl_sdca_3_in_1[] = {
 	{}
 };
 
+static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link2_rt1316_link01_rt714_link3[] = {
+	{
+		.mask = BIT(2),
+		.num_adr = ARRAY_SIZE(rt711_sdca_2_adr),
+		.adr_d = rt711_sdca_2_adr,
+	},
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(rt1316_0_group2_adr),
+		.adr_d = rt1316_0_group2_adr,
+	},
+	{
+		.mask = BIT(1),
+		.num_adr = ARRAY_SIZE(rt1316_1_group2_adr),
+		.adr_d = rt1316_1_group2_adr,
+	},
+	{
+		.mask = BIT(3),
+		.num_adr = ARRAY_SIZE(rt714_3_adr),
+		.adr_d = rt714_3_adr,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link12_rt714_link0[] = {
 	{
 		.mask = BIT(1),
@@ -372,6 +423,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l13-rt714-l2.tplg",
 	},
+	{
+		.link_mask = 0xF, /* 4 active links required */
+		.links = adl_sdw_rt711_link2_rt1316_link01_rt714_link3,
+		.drv_name = "sof_sdw",
+		.sof_fw_filename = "sof-adl.ri",
+		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01-rt714-l3.tplg",
+	},
 	{
 		.link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */
 		.links = adl_sdw_rt1316_link2_rt714_link3,
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 9/9] ASoC: Intel: sof_sdw: Add support for SKU 0B12 product
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
                   ` (7 preceding siblings ...)
  2021-11-05  2:26 ` [PATCH 8/9] ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration Bard Liao
@ 2021-11-05  2:26 ` Bard Liao
  2021-11-05 20:14 ` [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Mark Brown
  9 siblings, 0 replies; 11+ messages in thread
From: Bard Liao @ 2021-11-05  2:26 UTC (permalink / raw)
  To: broonie, tiwai; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

From: Gongjun Song <gongjun.song@intel.com>

This product supports a SoundWire headset codec, SoundWire
capture from local microphones and two SoundWire amplifiers.

Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index bfbdda323b87..77219c3f8766 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -288,6 +288,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 					RT711_JD2 |
 					SOF_SDW_FOUR_SPK),
 	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B12")
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					RT711_JD2 |
+					SOF_SDW_FOUR_SPK),
+	},
 	{
 		.callback = sof_sdw_quirk_cb,
 		.matches = {
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support
  2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
                   ` (8 preceding siblings ...)
  2021-11-05  2:26 ` [PATCH 9/9] ASoC: Intel: sof_sdw: Add support for SKU 0B12 product Bard Liao
@ 2021-11-05 20:14 ` Mark Brown
  9 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2021-11-05 20:14 UTC (permalink / raw)
  To: tiwai, Bard Liao; +Cc: alsa-devel, pierre-louis.bossart, bard.liao

On Fri, 5 Nov 2021 10:26:37 +0800, Bard Liao wrote:
> This series adds configurations for Dell ADL products.
> 
> Gongjun Song (9):
>   ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product
>   ASoC: Intel: soc-acpi: add SKU 0AF3 SoundWire configuration
>   ASoC: Intel: sof_sdw: Add support for SKU 0B00 and 0B01 products
>   ASoC: Intel: sof_sdw: Add support for SKU 0B11 product
>   ASoC: Intel: sof_sdw: Add support for SKU 0B13 product
>   ASoC: Intel: soc-acpi: add SKU 0B13 SoundWire configuration
>   ASoC: Intel: sof_sdw: Add support for SKU 0B29 product
>   ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration
>   ASoC: Intel: sof_sdw: Add support for SKU 0B12 product
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus

Thanks!

[1/9] ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product
      commit: 8f4fa45982b3f2daf5b3626ca0f12bde735f31ff
[2/9] ASoC: Intel: soc-acpi: add SKU 0AF3 SoundWire configuration
      commit: a1797d61cb35848432867a5bc294ce43058b5ead
[3/9] ASoC: Intel: sof_sdw: Add support for SKU 0B00 and 0B01 products
      commit: cf304329e4afb97ffabce232eadaba94f025641d
[4/9] ASoC: Intel: sof_sdw: Add support for SKU 0B11 product
      commit: 6fef4c2f458680399b7c512cb810c1e1784d7444
[5/9] ASoC: Intel: sof_sdw: Add support for SKU 0B13 product
      commit: 6448d0596e48dbc16a910f04ffc248c3f3c0a65c
[6/9] ASoC: Intel: soc-acpi: add SKU 0B13 SoundWire configuration
      commit: 11e18f582c14fdf08f52d99d439d2b82d98ac37d
[7/9] ASoC: Intel: sof_sdw: Add support for SKU 0B29 product
      commit: 0c2ed4f03f0bfe2be34efbabbebe9875c3aa9ca9
[8/9] ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration
      commit: 359ace2b9a411c3bd4b89fdc56f8b60e0f6696d2
[9/9] ASoC: Intel: sof_sdw: Add support for SKU 0B12 product
      commit: f55af7055cd465f6b767a0c1126977d4529c63c8

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2021-11-05 20:15 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-05  2:26 [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Bard Liao
2021-11-05  2:26 ` [PATCH 1/9] ASoC: Intel: sof_sdw: Add support for SKU 0AF3 product Bard Liao
2021-11-05  2:26 ` [PATCH 2/9] ASoC: Intel: soc-acpi: add SKU 0AF3 SoundWire configuration Bard Liao
2021-11-05  2:26 ` [PATCH 3/9] ASoC: Intel: sof_sdw: Add support for SKU 0B00 and 0B01 products Bard Liao
2021-11-05  2:26 ` [PATCH 4/9] ASoC: Intel: sof_sdw: Add support for SKU 0B11 product Bard Liao
2021-11-05  2:26 ` [PATCH 5/9] ASoC: Intel: sof_sdw: Add support for SKU 0B13 product Bard Liao
2021-11-05  2:26 ` [PATCH 6/9] ASoC: Intel: soc-acpi: add SKU 0B13 SoundWire configuration Bard Liao
2021-11-05  2:26 ` [PATCH 7/9] ASoC: Intel: sof_sdw: Add support for SKU 0B29 product Bard Liao
2021-11-05  2:26 ` [PATCH 8/9] ASoC: Intel: soc-acpi: add SKU 0B29 SoundWire configuration Bard Liao
2021-11-05  2:26 ` [PATCH 9/9] ASoC: Intel: sof_sdw: Add support for SKU 0B12 product Bard Liao
2021-11-05 20:14 ` [PATCH 0/9] ASoC: Ietel: Add Dell ADL products support Mark Brown

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.