[PATCH v1] 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: stable@vger.kernel.org # 5.4+ Reported-by: Cezary Rojewski cezary.rojewski@intel.com Tested-by: Lukasz Majczak lma@semihalf.com Signed-off-by: Lukasz Majczak lma@semihalf.com --- sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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 ba5ff468c265..8cab91a00b1a 100644 --- 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, @@ -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,
On 2021-07-30 1:59 PM, Lukasz Majczak wrote:
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.
Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters") Cc: stable@vger.kernel.org # 5.4+ Reported-by: Cezary Rojewski cezary.rojewski@intel.com
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:
Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com
Thanks, Czarek
On 7/30/21 6:59 AM, Lukasz Majczak wrote:
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: stable@vger.kernel.org # 5.4+ Reported-by: Cezary Rojewski cezary.rojewski@intel.com Tested-by: Lukasz Majczak lma@semihalf.com Signed-off-by: Lukasz Majczak lma@semihalf.com
sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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 ba5ff468c265..8cab91a00b1a 100644 --- 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",
that one is correct, that was a miss
.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"
.fw_filename = "intel/dsp_fw_kbl.bin", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &kbl_7219_98373_codecs,
On 2021-07-30 3:55 PM, Pierre-Louis Bossart wrote:
On 7/30/21 6:59 AM, Lukasz Majczak wrote:
...
@@ -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"
Not saying 'nay' or 'yay' but why is configuration first available on KBL platforms being renamed to 'cml_XXX'?
Czarek
On 7/30/21 9:05 AM, Cezary Rojewski wrote:
On 2021-07-30 3:55 PM, Pierre-Louis Bossart wrote:
On 7/30/21 6:59 AM, Lukasz Majczak wrote:
...
@@ -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"
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.
participants (3)
-
Cezary Rojewski -
Lukasz Majczak -
Pierre-Louis Bossart