From 54d8adcdae7161fd605f13556e21af6454ebb33b Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Mon, 11 Nov 2024 20:18:47 +0800 Subject: [PATCH] fixup! ASoC: Intel: soc-acpi-intel-lnl-match: add rt712_vb + rt1320 support We need to use snd_soc_acpi_intel_sdca_is_device_rt712_vb to check if the rt712 is vb. Also, fix the rt1320 ADR. I was testing with an old rt1320 version with class_id = 0. But, the class_id is 1 in the production version. Signed-off-by: Bard Liao --- sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b84617c61ba890..98a9c36d7a4cd0 100644 --- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c @@ -8,6 +8,7 @@ #include #include +#include "soc-acpi-intel-sdca-quirks.h" #include "soc-acpi-intel-sdw-mockup-match.h" struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[] = { @@ -287,7 +288,7 @@ static const struct snd_soc_acpi_adr_device rt1318_2_group1_adr[] = { static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = { { - .adr = 0x000130025d132000ull, + .adr = 0x000130025D132001ull, .num_endpoints = 1, .endpoints = &spk_r_endpoint, .name_prefix = "rt1320-1" @@ -546,6 +547,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = { .link_mask = BIT(1) | BIT(2), .links = lnl_sdw_rt712_vb_l2_rt1320_l1, .drv_name = "sof_sdw", + .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb, .sof_tplg_filename = "sof-lnl-rt712-l2-rt1320-l1.tplg" }, {},