All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, Libin Yang <libin.yang@intel.com>,
	broonie@kernel.org, Bard Liao <yung-chuan.liao@linux.intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 8/8] ASoC: Intel: soc-acpi: add entries in ADL match table
Date: Tue,  1 Mar 2022 13:49:03 -0600	[thread overview]
Message-ID: <20220301194903.60859-9-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20220301194903.60859-1-pierre-louis.bossart@linux.intel.com>

From: Libin Yang <libin.yang@intel.com>

Support configuration with SoundWire RT1316 amplifiers on link0 and
link1, and RT711 on link2 for headphone/headset. This product does not
support local microphones.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 .../intel/common/soc-acpi-intel-adl-match.c   | 25 +++++++++++++++++++
 1 file changed, 25 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 f120d7e2aecb..7c89a974b59f 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -260,6 +260,25 @@ static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link2_rt1316_link01_rt71
 	{}
 };
 
+static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link2_rt1316_link01[] = {
+	{
+		.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,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link12_rt714_link0[] = {
 	{
 		.mask = BIT(1),
@@ -480,6 +499,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01-rt714-l3.tplg",
 	},
+	{
+		.link_mask = 0x7, /* rt1316 on link0 and link1 & rt711 on link2*/
+		.links = adl_sdw_rt711_link2_rt1316_link01,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01.tplg",
+	},
 	{
 		.link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */
 		.links = adl_sdw_rt1316_link2_rt714_link3,
-- 
2.25.1


  parent reply	other threads:[~2022-03-01 19:52 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-01 19:48 [PATCH 0/8] ASoC: Intel: machine driver updates for 5.18 Pierre-Louis Bossart
2022-03-01 19:48 ` [PATCH 1/8] ASoC: soc-acpi: remove sof_fw_filename Pierre-Louis Bossart
2022-03-01 19:48 ` [PATCH 2/8] ASoC: Intel: boards: fix spelling in comments Pierre-Louis Bossart
2022-03-01 19:48 ` [PATCH 3/8] ASoC: Intel: add RT1308 I2S machine driver and HDMI-in capture via I2S support Pierre-Louis Bossart
2022-03-01 19:48 ` [PATCH 4/8] ASoC: Intel: boards: create sof-realtek-common module Pierre-Louis Bossart
2022-03-01 19:49 ` [PATCH 5/8] ASoC: Intel: sof_rt1308: move rt1308 code to common module Pierre-Louis Bossart
2022-03-01 19:49 ` [PATCH 6/8] ASoC: Intel: cirrus-common: support cs35l41 amplifier Pierre-Louis Bossart
2022-03-02 14:51   ` Amadeusz Sławiński
2022-03-02 15:46     ` Pierre-Louis Bossart
2022-03-01 19:49 ` [PATCH 7/8] ASoC: Intel: sof_ssp_amp: rename driver and " Pierre-Louis Bossart
2022-03-02 14:56   ` Amadeusz Sławiński
2022-03-02 15:50     ` Pierre-Louis Bossart
2022-03-02 16:05       ` Amadeusz Sławiński
2022-03-02 16:10         ` Mark Brown
2022-03-01 19:49 ` Pierre-Louis Bossart [this message]
2022-03-02 17:01 ` [PATCH 0/8] ASoC: Intel: machine driver updates for 5.18 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=20220301194903.60859-9-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=libin.yang@intel.com \
    --cc=tiwai@suse.de \
    --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 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.