]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Intel: soc-acpi: arl: Add match entries for new cs42l43 laptops
authorSimon Trimmer <simont@opensource.cirrus.com>
Fri, 6 Dec 2024 07:59:03 +0000 (15:59 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Dec 2024 13:12:09 +0000 (13:12 +0000)
Add some new match table entries on Arrowlake for some coming cs42l43
laptops.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20241206075903.195730-11-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/soc-acpi-intel-arl-match.c

index d7dfb23277d0912f189ca809ef8559946d3806f2..32147dc9d2d66664992df8ff8968d1092f2e35ab 100644 (file)
@@ -147,6 +147,24 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_l3_adr[] = {
        },
 };
 
+static const struct snd_soc_acpi_adr_device cs35l56_2_r3_adr[] = {
+       {
+               .adr = 0x00023301fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56_3_l1_adr[] = {
+       {
+               .adr = 0x00033101fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+};
+
 static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
        { /* Jack Playback Endpoint */
                .num = 0,
@@ -312,6 +330,25 @@ static const struct snd_soc_acpi_link_adr arl_cs42l43_l0_cs35l56_2_l23[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr arl_cs42l43_l0_cs35l56_3_l23[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43_0_adr),
+               .adr_d = cs42l43_0_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(cs35l56_2_r3_adr),
+               .adr_d = cs35l56_2_r3_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(cs35l56_3_l1_adr),
+               .adr_d = cs35l56_3_l1_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr arl_rvp[] = {
        {
                .mask = BIT(0),
@@ -406,6 +443,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-arl-cs42l43-l0-cs35l56-l23.tplg",
        },
+       {
+               .link_mask = BIT(0) | BIT(2) | BIT(3),
+               .links = arl_cs42l43_l0_cs35l56_3_l23,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-arl-cs42l43-l0-cs35l56-l23.tplg",
+       },
        {
                .link_mask = BIT(0) | BIT(2),
                .links = arl_cs42l43_l0_cs35l56_l2,