Skip to contentSkip to conversation

ASoC: Intel: kbl_da7219_max98357a: fix drv_name

PATCH In review Lukasz Majczak 3 participants 5 messages Jul 30, 2021

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

PATCH 1/1 ASoC: Intel: kbl_da7219_max98357a: fix drv_name

platform_id for kbl_da7219_max98357a was shrunk for kbl_da7219_mx98357a, but the drv_name was changed for kbl_da7219_max98373. Tested on a Pixelbook (Atlas).

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +2 -2
index ba5ff468c265..8cab91a00b1a 100644
@@ -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,
@@ -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.32.0.554.ge1b32706d8-goog
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Lukasz Majczak

platform_id for kbl_da7219_max98357a was shrunk for kbl_da7219_mx98357a, but the drv_name was changed for kbl_da7219_max98373. Tested on a Pixelbook (Atlas).

Reasoning behind Pierre's initial commit is valid and I believe kbl_da7219_max98373 name change was simply unintended. To make the situation clearer, please be more elaborate in commit's message.

Quoted 3 lines
Fixes 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Cc <[email protected]> # 5.4+

Please reword to: Suggested-by. I certainly wasn't the one who found the problem first, but I did provide the initial fix.

I don't see any problem is the code, so besides formalities:

Thanks,
Czarek

#2 lore raw
In reply to Lukasz Majczak
Quoted 18 lines · Lukasz Majczak

platform_id for kbl_da7219_max98357a was shrunk for kbl_da7219_mx98357a, but the drv_name was changed for kbl_da7219_max98373. Tested on a Pixelbook (Atlas).

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +0 -0
index ba5ff468c265..8cab91a00b1a 100644

sound/soc/intel/common/soc-acpi-intel-kbl-match.c struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = { · line 90

Quoted 5 lines
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +1 -1
@@ -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",

that one is correct, that was a miss

sound/soc/intel/common/soc-acpi-intel-kbl-match.c struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = { · line 116

Quoted 9 lines
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +1 -1
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98357_codecs,
@@ -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",

this one is wrong though? The correct name was already present, you're reverting back to the wrong name.

there's another one that I missed, do you mind changing this as well?

soc-acpi-intel-cml-match.c: .drv_name = "cml_da7219_max98357a",

Should be "cml_da7219_mx98357a"

Quoted 4 lines
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +0 -0
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &kbl_7219_98373_codecs,
maintainer
#3 lore raw
Quoted 1 line · Pierre-Louis Bossart

On 7/30/21 6:59 AM, Lukasz Majczak wrote:

...

Quoted 10 lines

sound/soc/intel/common/soc-acpi-intel-kbl-match.c struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = { · line 116

Quoted 6 lines
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +1 -1
@@ -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",

this one is wrong though? The correct name was already present, you're reverting back to the wrong name.

Quoted 7 lines

there's another one that I missed, do you mind changing this as well?

soc-acpi-intel-cml-match.c: .drv_name = "cml_da7219_max98357a",

Should be "cml_da7219_mx98357a"

Not saying 'nay' or 'yay' but why is configuration first available on KBL platforms being renamed to 'cml_XXX'?

Czarek

#4 lore raw
Quoted 21 lines · Cezary Rojewski
Quoted 1 line · Pierre-Louis Bossart

On 7/30/21 6:59 AM, Lukasz Majczak wrote:

...

Quoted 16 lines

sound/soc/intel/common/soc-acpi-intel-kbl-match.c struct snd_soc_acpi_mach · line 117

Quoted 7 lines
sound/soc/intel/common/soc-acpi-intel-kbl-match.c +1 -1
@@ -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",

this one is wrong though? The correct name was already present, you're reverting back to the wrong name.

there's another one that I missed, do you mind changing this as well?

soc-acpi-intel-cml-match.c:             .drv_name = "cml_da7219_max98357a",

Quoted 6 lines
Quoted 3 lines

Should be "cml_da7219_mx98357a"

Not saying 'nay' or 'yay' but why is configuration first available on KBL platforms being renamed to 'cml_XXX'?

The same bxt_da7219_max98357a.c machine driver is used for multiple devices.

static const struct platform_device_id bxt_board_ids[] = {
	{ .name = "bxt_da7219_mx98357a" },
	{ .name = "glk_da7219_mx98357a" },
	{ .name = "cml_da7219_mx98357a" },
	{ }
};

MODULE_DEVICE_TABLE(platform, bxt_board_ids);

Why there are different drivers for KBL and BXT is probably lost in history.