]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Intel: soc-acpi-intel-lnl-match: add rt1320_l12_rt714_l0 support
authorMac Chiang <mac.chiang@intel.com>
Tue, 8 Jul 2025 08:00:29 +0000 (16:00 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 8 Jul 2025 08:49:58 +0000 (09:49 +0100)
This patch add acpi matching support for the rt1320 left and right
amplifiers on soundwire link 1 and 2, and the rt714 dmic on
soundwire link 0.

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20250708080030.1257790-5-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/soc-acpi-intel-lnl-match.c

index 558dc4c912397dbb40cc4f843d02b405a9455458..937a74a5d523726fa842e3ad3be4a075e90a1417 100644 (file)
@@ -419,6 +419,15 @@ static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt1320_2_group2_adr[] = {
+       {
+               .adr = 0x000231025D132001ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1320-2"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device rt1320_1_group2_adr[] = {
        {
                .adr = 0x000130025D132001ull,
@@ -609,6 +618,25 @@ static const struct snd_soc_acpi_link_adr lnl_sdw_rt1318_l12_rt714_l0[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr lnl_sdw_rt1320_l12_rt714_l0[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt1320_1_group2_adr),
+               .adr_d = rt1320_1_group2_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(rt1320_2_group2_adr),
+               .adr_d = rt1320_2_group2_adr,
+       },
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt714_0_adr),
+               .adr_d = rt714_0_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_l0_rt1318_l1[] = {
        {
                .mask = BIT(0),
@@ -740,6 +768,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-lnl-rt1318-l12-rt714-l0.tplg"
        },
+       {
+               .link_mask = GENMASK(2, 0),
+               .links = lnl_sdw_rt1320_l12_rt714_l0,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-lnl-rt1320-l12-rt714-l0.tplg"
+       },
        {
                .link_mask = BIT(0) | BIT(1),
                .links = lnl_sdw_rt713_l0_rt1318_l1,