ASoC: Intel: Fix platform ID matching

Sparse warnings triggered truncating the IDs of some platform device
tables. Unfortunately some of the IDs in the match tables were missed
which breaks audio. The KBL change has been verified to fix audio, the
CML change was not tested as it was found through grepping the broken
changes and found to match the same situation in anticipation that it
should also be fixed.

Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Tested-by: Matt Davis <mattedavis@google.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210809213544.1682444-1-cujomalainey@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 42ef51c3fb4f46756a26cc1d3994b154363803ca..b591c6fd13fddacd5484c4ba0d393c7eecc414b8 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -75,7 +75,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
        },
        {
                .id = "DLGS7219",
-               .drv_name = "cml_da7219_max98357a",
+               .drv_name = "cml_da7219_mx98357a",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &max98390_spk_codecs,
                .sof_fw_filename = "sof-cml.ri",

diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
index ba5ff468c265a90f1ffd52cedb95be9139fd8cdf..741bf2f9e081fa9657370ba17f510d9a9f6f5000 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
@@ -87,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
        },
        {
                .id = "DLGS7219",
-               .drv_name = "kbl_da7219_max98357a",
+               .drv_name = "kbl_da7219_mx98357a",
                .fw_filename = "intel/dsp_fw_kbl.bin",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &kbl_7219_98357_codecs,