[PATCH v2] ASoC: Intel: Fix platform ID matching

[PATCH v2] ASoC: Intel: Fix platform ID matching

[Curtis Malainey]

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: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Tested-by: Matt Davis <mattedavis@google.com>
---
 sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +-
 sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 42ef51c3fb4f..b591c6fd13fd 100644
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -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",
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..741bf2f9e081 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,
-- 
2.32.0.605.g8dce9f2422-goog

Re: [PATCH v2] ASoC: Intel: Fix platform ID matching

[Pierre-Louis Bossart]

On 8/9/21 4:35 PM, Curtis Malainey wrote:
> 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: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
> Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
> Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
> Tested-by: Matt Davis <mattedavis@google.com>

Thanks Curtis, this is exactly what I suggested in my earlier review of
Lukasz Majczak's "[PATCH v1] ASoC: Intel: kbl_da7219_max98357a: fix
drv_name"

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

Sorry about these misses...

> ---
>  sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +-
>  sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
> index 42ef51c3fb4f..b591c6fd13fd 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
> @@ -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",
> 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..741bf2f9e081 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,
> 

Re: [PATCH v2] ASoC: Intel: Fix platform ID matching

[Cezary Rojewski]

On 2021-08-09 11:35 PM, Curtis Malainey wrote:
> 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: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
> Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
> Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
> Tested-by: Matt Davis <mattedavis@google.com>

Thanks for the update, Curtis.

This is still missing Suggested-by tag from my previous review.
As kbl bits were tested by Lukasz it would be good to have his Tested-by 
tag too.

With said tags appended:

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>


Regards,
Czarek

Re: [PATCH v2] ASoC: Intel: Fix platform ID matching

[Mark Brown]

On Mon, 9 Aug 2021 14:35:39 -0700, Curtis Malainey wrote:
> 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.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: Fix platform ID matching
      commit: f4eeaed04e861b95f1f2c911263f2fcaa959c078

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH v2] ASoC: Intel: Fix platform ID matching

[Curtis Malainey]

On Tue, Aug 10, 2021 at 5:23 AM Cezary Rojewski
<cezary.rojewski@intel.com> wrote:
>
> On 2021-08-09 11:35 PM, Curtis Malainey wrote:
> > 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: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
> > Fixes: 24e46fb811e9 ("ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters")
> > Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
> > Tested-by: Matt Davis <mattedavis@google.com>
>
> Thanks for the update, Curtis.
>
> This is still missing Suggested-by tag from my previous review.
> As kbl bits were tested by Lukasz it would be good to have his Tested-by
> tag too.
>
> With said tags appended:
>
> Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>

Ah i was not privy to that patch, this bug was found independently on
another board. Thanks for the heads up though.

>
>
> Regards,
> Czarek