Skip to contentSkip to conversation

ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373

PATCH In review Lukasz Majczak 4 participants 5 messages Aug 19, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373

Sparse warnings triggered truncating the IDs of some platform device tables. Unfortunately kbl_da7219_max98373 was also truncated. This patch is reverting the original ID.
Tested on Atlas chromebook.

Fixes 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Cc <[email protected]> # 5.4+
---
 sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +1 -1
index 741bf2f9e081..8cab91a00b1a 100644
@@ -113,7 +113,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "kbl_da7219_mx98373",
+		.drv_name = "kbl_da7219_max98373",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98373_codecs,
Signature · 1 line
2.33.0.rc2.250.ged5fa647cd-goog
#1 lore raw
Quoted 4 lines · Lukasz Majczak

Sparse warnings triggered truncating the IDs of some platform device tables. Unfortunately kbl_da7219_max98373 was also truncated. This patch is reverting the original ID.
Tested on Atlas chromebook.

Instead of reverting, how about changing the remaining occurrences of the old name in the machine driver?

sound/soc/intel/boards/kbl_da7219_max98927.c: if (!strcmp(pdev->name,
"kbl_da7219_max98373") ||
sound/soc/intel/boards/kbl_da7219_max98927.c: .name =
"kbl_da7219_max98373",

Quoted 24 lines
Fixes 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Cc <[email protected]> # 5.4+
---
 sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +1 -1
index 741bf2f9e081..8cab91a00b1a 100644
@@ -113,7 +113,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "kbl_da7219_mx98373",
+		.drv_name = "kbl_da7219_max98373",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98373_codecs,
maintainer
#2 lore raw
Quoted 6 lines · Pierre-Louis Bossart
Quoted 4 lines · Lukasz Majczak

Sparse warnings triggered truncating the IDs of some platform device tables. Unfortunately kbl_da7219_max98373 was also truncated. This patch is reverting the original ID.
Tested on Atlas chromebook.

Quoted 7 lines

Instead of reverting, how about changing the remaining occurrences of the old name in the machine driver?

sound/soc/intel/boards/kbl_da7219_max98927.c: if (!strcmp(pdev->name,
"kbl_da7219_max98373") ||
sound/soc/intel/boards/kbl_da7219_max98927.c: .name =
"kbl_da7219_max98373",

Mentioned by 'Fixes' tag patch clearly introduced regression. If we are to update any name-fields, it's better to have a fresh start and update all the boards in one-go than doing so separately.

Apart from that, Maxim codecs go by the name of 'max' in sound/soc/codecs/. It's more intuitive to have equivalent shortcut used in board's name.

Regards,
Czarek

#3 lore raw
Quoted 15 lines · Cezary Rojewski
Quoted 6 lines · Pierre-Louis Bossart
Quoted 4 lines · Lukasz Majczak

Sparse warnings triggered truncating the IDs of some platform device tables. Unfortunately kbl_da7219_max98373 was also truncated. This patch is reverting the original ID.
Tested on Atlas chromebook.

Quoted 7 lines

Instead of reverting, how about changing the remaining occurrences of the old name in the machine driver?

sound/soc/intel/boards/kbl_da7219_max98927.c:   if (!strcmp(pdev->name, "kbl_da7219_max98373") || sound/soc/intel/boards/kbl_da7219_max98927.c:           .name = "kbl_da7219_max98373",

Quoted 7 lines

Mentioned by 'Fixes' tag patch clearly introduced regression. If we are to update any name-fields, it's better to have a fresh start and update all the boards in one-go than doing so separately.

Apart from that, Maxim codecs go by the name of 'max' in sound/soc/codecs/. It's more intuitive to have equivalent shortcut used in board's name.

the ACPI HID start with MX and there's not much consistency in naming, is there?

		.drv_name = "kbl_r5514_5663_max",
		.drv_name = "kbl_rt5663_m98927",
		.drv_name = "kbl_da7219_mx98357a",
		.drv_name = "kbl_da7219_max98927",
		.drv_name = "kbl_max98373",
#4 lore raw
Quoted 10 lines · Pierre-Louis Bossart
Quoted 6 lines

Apart from that, Maxim codecs go by the name of 'max' in sound/soc/codecs/. It's more intuitive to have equivalent shortcut used in board's name.

the ACPI HID start with MX and there's not much consistency in naming, is there?

Quoted 7 lines
                .drv_name = "kbl_r5514_5663_max",
                .drv_name = "kbl_rt5663_m98927",
                .drv_name = "kbl_da7219_mx98357a",
                .drv_name = "kbl_da7219_max98927",
                .drv_name = "kbl_max98373",

Agreed, it is definitely better to revisit and get it all in one go so we don't end up with a cherry-picking nightmare