Unverified Commit f4eeaed0 authored by Curtis Malainey's avatar Curtis Malainey Committed by Mark Brown
Browse files

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: 94efd726 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Fixes: 24e46fb8 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
Signed-off-by: default avatarCurtis Malainey <cujomalainey@chromium.org>
Tested-by: default avatarMatt Davis <mattedavis@google.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210809213544.1682444-1-cujomalainey@chromium.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e5ada3f6

sound/soc/intel/common/soc-acpi-intel-cml-match.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

sound/soc/intel/common/soc-acpi-intel-kbl-match.c

+1 −1
Original line number Diff line number Diff line
@@ -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,