LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2] ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373
@ 2021-08-19  8:24 Lukasz Majczak
  2021-08-19 14:30 ` Pierre-Louis Bossart
  0 siblings, 1 reply; 5+ messages in thread
From: Lukasz Majczak @ 2021-08-19  8:24 UTC (permalink / raw)
  To: Cezary Rojewski, Pierre-Louis Bossart
  Cc: upstream, alsa-devel, linux-kernel, Curtis Malainey,
	Lukasz Majczak, stable

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: <stable@vger.kernel.org> # 5.4+
Tested-by: Lukasz Majczak <lma@semihalf.com>
Signed-off-by: Lukasz Majczak <lma@semihalf.com>
Suggested-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 741bf2f9e081..8cab91a00b1a 100644
--- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
@@ -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,
-- 
2.33.0.rc2.250.ged5fa647cd-goog


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373
  2021-08-19  8:24 [PATCH v2] ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373 Lukasz Majczak
@ 2021-08-19 14:30 ` Pierre-Louis Bossart
  2021-08-19 15:06   ` Cezary Rojewski
  0 siblings, 1 reply; 5+ messages in thread
From: Pierre-Louis Bossart @ 2021-08-19 14:30 UTC (permalink / raw)
  To: Lukasz Majczak, Cezary Rojewski
  Cc: upstream, alsa-devel, linux-kernel, Curtis Malainey, stable



On 8/19/21 3:24 AM, Lukasz Majczak wrote:
> 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",


> 
> Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
> Cc: <stable@vger.kernel.org> # 5.4+
> Tested-by: Lukasz Majczak <lma@semihalf.com>
> Signed-off-by: Lukasz Majczak <lma@semihalf.com>
> Suggested-by: Cezary Rojewski <cezary.rojewski@intel.com>
> ---
>  sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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 741bf2f9e081..8cab91a00b1a 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
> @@ -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,
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373
  2021-08-19 14:30 ` Pierre-Louis Bossart
@ 2021-08-19 15:06   ` Cezary Rojewski
  2021-08-19 15:18     ` Pierre-Louis Bossart
  0 siblings, 1 reply; 5+ messages in thread
From: Cezary Rojewski @ 2021-08-19 15:06 UTC (permalink / raw)
  To: Pierre-Louis Bossart, Lukasz Majczak
  Cc: upstream, alsa-devel, linux-kernel, Curtis Malainey, stable

On 2021-08-19 4:30 PM, Pierre-Louis Bossart wrote:
> On 8/19/21 3:24 AM, Lukasz Majczak wrote:
>> 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",

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373
  2021-08-19 15:06   ` Cezary Rojewski
@ 2021-08-19 15:18     ` Pierre-Louis Bossart
  2021-08-19 19:56       ` Curtis Malainey
  0 siblings, 1 reply; 5+ messages in thread
From: Pierre-Louis Bossart @ 2021-08-19 15:18 UTC (permalink / raw)
  To: Cezary Rojewski, Lukasz Majczak
  Cc: upstream, alsa-devel, linux-kernel, Curtis Malainey, stable



On 8/19/21 10:06 AM, Cezary Rojewski wrote:
> On 2021-08-19 4:30 PM, Pierre-Louis Bossart wrote:
>> On 8/19/21 3:24 AM, Lukasz Majczak wrote:
>>> 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",
> 
> 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",

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373
  2021-08-19 15:18     ` Pierre-Louis Bossart
@ 2021-08-19 19:56       ` Curtis Malainey
  0 siblings, 0 replies; 5+ messages in thread
From: Curtis Malainey @ 2021-08-19 19:56 UTC (permalink / raw)
  To: Pierre-Louis Bossart
  Cc: Cezary Rojewski, Lukasz Majczak, upstream, ALSA development,
	Linux Kernel Mailing List, Curtis Malainey, stable

On Thu, Aug 19, 2021 at 8:18 AM Pierre-Louis Bossart
<pierre-louis.bossart@linux.intel.com> wrote:
>
>
> >
> > 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",
>
> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

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

Acked-by: Curtis Malainey <cujomalainey@chromium.org>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-08-19 19:56 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-19  8:24 [PATCH v2] ASoC: Intel: Fix platform ID matching for kbl_da7219_max98373 Lukasz Majczak
2021-08-19 14:30 ` Pierre-Louis Bossart
2021-08-19 15:06   ` Cezary Rojewski
2021-08-19 15:18     ` Pierre-Louis Bossart
2021-08-19 19:56       ` Curtis Malainey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).