5.10 backport request: ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

5.10 backport request: ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

Hello,

I would like to request backporting the following patch to 5.10 series:

  590cfb082837cc6c0c595adf1711330197c86a58
  ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

The patch seems to be already present in 5.15 and newer branches, and
its lack seems to be causing out-of-bounds read.  I've hit it in the
wild while trying to install 5.10.241 on i686:

  sh /var/tmp/portage/sys-kernel/gentoo-kernel-5.10.241/work/linux-5.10/scripts/depmod.sh depmod 5.10.241-gentoo-dist
depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
platform:jsl_rt5682_max98360ax�

TIA.

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

Re: 5.10 backport request: ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1870 bytes --]

Hello,

On Fri, 2025-08-29 at 08:03 +0200, Michał Górny wrote:
> Hello,
> 
> I would like to request backporting the following patch to 5.10 series:
> 
>   590cfb082837cc6c0c595adf1711330197c86a58
>   ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
> 
> The patch seems to be already present in 5.15 and newer branches, and
> its lack seems to be causing out-of-bounds read.  I've hit it in the
> wild while trying to install 5.10.241 on i686:
> 
>   sh /var/tmp/portage/sys-kernel/gentoo-kernel-5.10.241/work/linux-5.10/scripts/depmod.sh depmod 5.10.241-gentoo-dist
> depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
> platform:jsl_rt5682_max98360ax�
> 

I'm sorry, I should've waited for my test results first.  Looks like
this patch alone is insufficient.  Looking at 5.15 stable branch, I see
that we probably need:

    ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters
    ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
    ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 characters
    ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters
    ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters
    ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard
    ASoC: Intel: Fix platform ID matching

Unless I'm mistaken, the firt series are part of the merge commit
98c69fcc9f5902b0c340acdbbfa365464efc52d2.  The followup fixes are:

    0f32d9eb38c13c32895b5bf695eac639cee02d6c
    f4eeaed04e861b95f1f2c911263f2fcaa959c078

I didn't find anything else that seemed obviously elevant, but I didn't
dug deep.  With these backports, I can build 5.10.241 fine -- but I
don't have any hardware to test these drivers.

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

Re: 5.10 backport request: ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

[Greg KH]

On Fri, Aug 29, 2025 at 09:09:33AM +0200, Michał Górny wrote:
> Hello,
> 
> On Fri, 2025-08-29 at 08:03 +0200, Michał Górny wrote:
> > Hello,
> > 
> > I would like to request backporting the following patch to 5.10 series:
> > 
> >   590cfb082837cc6c0c595adf1711330197c86a58
> >   ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
> > 
> > The patch seems to be already present in 5.15 and newer branches, and
> > its lack seems to be causing out-of-bounds read.  I've hit it in the
> > wild while trying to install 5.10.241 on i686:
> > 
> >   sh /var/tmp/portage/sys-kernel/gentoo-kernel-5.10.241/work/linux-5.10/scripts/depmod.sh depmod 5.10.241-gentoo-dist
> > depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
> > platform:jsl_rt5682_max98360ax�
> > 
> 
> I'm sorry, I should've waited for my test results first.  Looks like
> this patch alone is insufficient.  Looking at 5.15 stable branch, I see
> that we probably need:
> 
>     ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters
>     ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
>     ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 characters
>     ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters
>     ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters
>     ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard
>     ASoC: Intel: Fix platform ID matching
> 
> Unless I'm mistaken, the firt series are part of the merge commit
> 98c69fcc9f5902b0c340acdbbfa365464efc52d2.  The followup fixes are:
> 
>     0f32d9eb38c13c32895b5bf695eac639cee02d6c
>     f4eeaed04e861b95f1f2c911263f2fcaa959c078
> 
> I didn't find anything else that seemed obviously elevant, but I didn't
> dug deep.  With these backports, I can build 5.10.241 fine -- but I
> don't have any hardware to test these drivers.

So what exact commits are needed and in what order?  Can you just send
tested backports to us so that we know we got it right?

thanks,

greg k-h

Re: 5.10 backport request: ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 2367 bytes --]

On Fri, 2025-08-29 at 15:55 +0200, Greg KH wrote:
> On Fri, Aug 29, 2025 at 09:09:33AM +0200, Michał Górny wrote:
> > Hello,
> > 
> > On Fri, 2025-08-29 at 08:03 +0200, Michał Górny wrote:
> > > Hello,
> > > 
> > > I would like to request backporting the following patch to 5.10 series:
> > > 
> > >   590cfb082837cc6c0c595adf1711330197c86a58
> > >   ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
> > > 
> > > The patch seems to be already present in 5.15 and newer branches, and
> > > its lack seems to be causing out-of-bounds read.  I've hit it in the
> > > wild while trying to install 5.10.241 on i686:
> > > 
> > >   sh /var/tmp/portage/sys-kernel/gentoo-kernel-5.10.241/work/linux-5.10/scripts/depmod.sh depmod 5.10.241-gentoo-dist
> > > depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
> > > platform:jsl_rt5682_max98360ax�
> > > 
> > 
> > I'm sorry, I should've waited for my test results first.  Looks like
> > this patch alone is insufficient.  Looking at 5.15 stable branch, I see
> > that we probably need:
> > 
> >     ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters
> >     ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
> >     ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 characters
> >     ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters
> >     ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters
> >     ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard
> >     ASoC: Intel: Fix platform ID matching
> > 
> > Unless I'm mistaken, the firt series are part of the merge commit
> > 98c69fcc9f5902b0c340acdbbfa365464efc52d2.  The followup fixes are:
> > 
> >     0f32d9eb38c13c32895b5bf695eac639cee02d6c
> >     f4eeaed04e861b95f1f2c911263f2fcaa959c078
> > 
> > I didn't find anything else that seemed obviously elevant, but I didn't
> > dug deep.  With these backports, I can build 5.10.241 fine -- but I
> > don't have any hardware to test these drivers.
> 
> So what exact commits are needed and in what order?  Can you just send
> tested backports to us so that we know we got it right?

Would it be okay if I cherry-picked them from 5.15.y rather than from
master?

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

Re: 5.10 backport request: ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

[Greg KH]

On Sun, Aug 31, 2025 at 08:25:07PM +0200, Michał Górny wrote:
> On Fri, 2025-08-29 at 15:55 +0200, Greg KH wrote:
> > On Fri, Aug 29, 2025 at 09:09:33AM +0200, Michał Górny wrote:
> > > Hello,
> > > 
> > > On Fri, 2025-08-29 at 08:03 +0200, Michał Górny wrote:
> > > > Hello,
> > > > 
> > > > I would like to request backporting the following patch to 5.10 series:
> > > > 
> > > >   590cfb082837cc6c0c595adf1711330197c86a58
> > > >   ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
> > > > 
> > > > The patch seems to be already present in 5.15 and newer branches, and
> > > > its lack seems to be causing out-of-bounds read.  I've hit it in the
> > > > wild while trying to install 5.10.241 on i686:
> > > > 
> > > >   sh /var/tmp/portage/sys-kernel/gentoo-kernel-5.10.241/work/linux-5.10/scripts/depmod.sh depmod 5.10.241-gentoo-dist
> > > > depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
> > > > platform:jsl_rt5682_max98360ax�
> > > > 
> > > 
> > > I'm sorry, I should've waited for my test results first.  Looks like
> > > this patch alone is insufficient.  Looking at 5.15 stable branch, I see
> > > that we probably need:
> > > 
> > >     ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters
> > >     ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
> > >     ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 characters
> > >     ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters
> > >     ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters
> > >     ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard
> > >     ASoC: Intel: Fix platform ID matching
> > > 
> > > Unless I'm mistaken, the firt series are part of the merge commit
> > > 98c69fcc9f5902b0c340acdbbfa365464efc52d2.  The followup fixes are:
> > > 
> > >     0f32d9eb38c13c32895b5bf695eac639cee02d6c
> > >     f4eeaed04e861b95f1f2c911263f2fcaa959c078
> > > 
> > > I didn't find anything else that seemed obviously elevant, but I didn't
> > > dug deep.  With these backports, I can build 5.10.241 fine -- but I
> > > don't have any hardware to test these drivers.
> > 
> > So what exact commits are needed and in what order?  Can you just send
> > tested backports to us so that we know we got it right?
> 
> Would it be okay if I cherry-picked them from 5.15.y rather than from
> master?

We need the commit id from Linus's tree in them, not the id from 5.15.y,
for obvious reasons.

thanks,

greg k-h

[PATCH linux-5.10.y 1/5] ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters

[Michał Górny]

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

commit 24e46fb811e991f56d5694b10ae7ceb8d2b8c846 upstream.

The excessive platform id lengths are causing out-of-buffer reads
in depmod, e.g.:

depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
platform:jsl_rt5682_max98360ax�

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210511213707.32958-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/bxt_da7219_max98357a.c     | 12 ++++++------
 sound/soc/intel/common/soc-acpi-intel-bxt-match.c |  2 +-
 sound/soc/intel/common/soc-acpi-intel-cml-match.c |  2 +-
 sound/soc/intel/common/soc-acpi-intel-glk-match.c |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 1a24c44db6dd..85738fd20b22 100644
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -840,9 +840,9 @@ static int broxton_audio_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bxt_board_ids[] = {
-	{ .name = "bxt_da7219_max98357a" },
-	{ .name = "glk_da7219_max98357a" },
-	{ .name = "cml_da7219_max98357a" },
+	{ .name = "bxt_da7219_mx98357a" },
+	{ .name = "glk_da7219_mx98357a" },
+	{ .name = "cml_da7219_mx98357a" },
 	{ }
 };
 
@@ -866,6 +866,6 @@ MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
 MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");
 MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:bxt_da7219_max98357a");
-MODULE_ALIAS("platform:glk_da7219_max98357a");
-MODULE_ALIAS("platform:cml_da7219_max98357a");
+MODULE_ALIAS("platform:bxt_da7219_mx98357a");
+MODULE_ALIAS("platform:glk_da7219_mx98357a");
+MODULE_ALIAS("platform:cml_da7219_mx98357a");
diff --git a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
index 32f77e29c2ff..d467663f6757 100644
--- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
@@ -56,7 +56,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "bxt_da7219_max98357a",
+		.drv_name = "bxt_da7219_mx98357a",
 		.fw_filename = "intel/dsp_fw_bxtn.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &bxt_codecs,
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 9b85811ffd51..43bba5670ab1 100644
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -54,7 +54,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 = &max98357a_spk_codecs,
 		.sof_fw_filename = "sof-cml.ri",
diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
index 26cb3b16cdd3..ac8f77d0afa9 100644
--- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
@@ -24,7 +24,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "glk_da7219_max98357a",
+		.drv_name = "glk_da7219_mx98357a",
 		.fw_filename = "intel/dsp_fw_glk.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &glk_codecs,

[PATCH linux-5.10.y 2/5] ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

[Michał Górny]

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

commit 590cfb082837cc6c0c595adf1711330197c86a58 upstream.

The excessive platform id lengths are causing out-of-buffer reads
in depmod, e.g.:

depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
platform:jsl_rt5682_max98360ax�

I needed to account for some of the drivers being missing in 5.10
while rebasing (i.e. mismatched context).

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210621194057.21711-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/sof_rt5682.c               | 12 ++++++------
 sound/soc/intel/common/soc-acpi-intel-jsl-match.c |  2 +-
 sound/soc/intel/common/soc-acpi-intel-tgl-match.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 5883d1fa3b7e..414dc594014d 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -844,7 +844,7 @@ static const struct platform_device_id board_ids[] = {
 		.name = "sof_rt5682",
 	},
 	{
-		.name = "tgl_max98357a_rt5682",
+		.name = "tgl_mx98357a_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -861,7 +861,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_RT5682_SSP_AMP(1)),
 	},
 	{
-		.name = "tgl_max98373_rt5682",
+		.name = "tgl_mx98373_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -870,7 +870,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_RT5682_NUM_HDMIDEV(4)),
 	},
 	{
-		.name = "jsl_rt5682_max98360a",
+		.name = "jsl_rt5682_mx98360a",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_MCLK_24MHZ |
 					SOF_RT5682_SSP_CODEC(0) |
@@ -898,7 +898,7 @@ MODULE_AUTHOR("Bard Liao <bard.liao@intel.com>");
 MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:sof_rt5682");
-MODULE_ALIAS("platform:tgl_max98357a_rt5682");
+MODULE_ALIAS("platform:tgl_mx98357a_rt5682");
 MODULE_ALIAS("platform:jsl_rt5682_rt1015");
-MODULE_ALIAS("platform:tgl_max98373_rt5682");
-MODULE_ALIAS("platform:jsl_rt5682_max98360a");
+MODULE_ALIAS("platform:tgl_mx98373_rt5682");
+MODULE_ALIAS("platform:jsl_rt5682_mx98360a");
diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index 34f5fcad5701..a539b65ba254 100644
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -54,7 +54,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "jsl_rt5682_max98360a",
+		.drv_name = "jsl_rt5682_mx98360a",
 		.sof_fw_filename = "sof-jsl.ri",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &mx98360a_spk,
diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 15d862cdcd2f..f7c491eba1e7 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -321,7 +321,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "tgl_max98357a_rt5682",
+		.drv_name = "tgl_mx98357a_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &tgl_codecs,
 		.sof_fw_filename = "sof-tgl.ri",
@@ -329,7 +329,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "tgl_max98373_rt5682",
+		.drv_name = "tgl_mx98373_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &tgl_max98373_amp,
 		.sof_fw_filename = "sof-tgl.ri",

[PATCH linux-5.10.y 3/5] ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 characters

[Michał Górny]

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

commit bc47256afef38175a0ad6bcfd4dbab9d2c65b377 upstream.

The excessive platform id lengths are causing out-of-buffer reads
in depmod, e.g.:

depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
platform:jsl_rt5682_max98360ax�

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210621194057.21711-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/glk_rt5682_max98357a.c     | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-glk-match.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c
index c1b789ac6d50..005bd96175cf 100644
--- a/sound/soc/intel/boards/glk_rt5682_max98357a.c
+++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c
@@ -621,7 +621,7 @@ static int geminilake_audio_probe(struct platform_device *pdev)
 
 static const struct platform_device_id glk_board_ids[] = {
 	{
-		.name = "glk_rt5682_max98357a",
+		.name = "glk_rt5682_mx98357a",
 		.driver_data =
 			(kernel_ulong_t)&glk_audio_card_rt5682_m98357a,
 	},
@@ -643,4 +643,4 @@ MODULE_DESCRIPTION("Geminilake Audio Machine driver-RT5682 & MAX98357A in I2S mo
 MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
 MODULE_AUTHOR("Harsha Priya <harshapriya.n@intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:glk_rt5682_max98357a");
+MODULE_ALIAS("platform:glk_rt5682_mx98357a");
diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
index ac8f77d0afa9..e05db22d860c 100644
--- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
@@ -33,7 +33,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "glk_rt5682_max98357a",
+		.drv_name = "glk_rt5682_mx98357a",
 		.fw_filename = "intel/dsp_fw_glk.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &glk_codecs,

[PATCH linux-5.10.y 4/5] ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters

[Michał Górny]

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

commit 1cc04d195dc245457a45df60e6558b460b8e4c71 upstream.

The excessive platform id lengths are causing out-of-buffer reads
in depmod, e.g.:

depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
platform:jsl_rt5682_max98360ax�

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210621194057.21711-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/sof_da7219_max98373.c      | 8 ++++----
 sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c
index 8d1ad892e86b..387bc8c962d9 100644
--- a/sound/soc/intel/boards/sof_da7219_max98373.c
+++ b/sound/soc/intel/boards/sof_da7219_max98373.c
@@ -431,11 +431,11 @@ static int audio_probe(struct platform_device *pdev)
 
 static const struct platform_device_id board_ids[] = {
 	{
-		.name = "sof_da7219_max98373",
+		.name = "sof_da7219_mx98373",
 		.driver_data = (kernel_ulong_t)&card_da7219_m98373,
 	},
 	{
-		.name = "sof_da7219_max98360a",
+		.name = "sof_da7219_mx98360a",
 		.driver_data = (kernel_ulong_t)&card_da7219_m98360a,
 	},
 	{ }
@@ -456,5 +456,5 @@ module_platform_driver(audio)
 MODULE_DESCRIPTION("ASoC Intel(R) SOF Machine driver");
 MODULE_AUTHOR("Yong Zhi <yong.zhi@intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:sof_da7219_max98360a");
-MODULE_ALIAS("platform:sof_da7219_max98373");
+MODULE_ALIAS("platform:sof_da7219_mx98360a");
+MODULE_ALIAS("platform:sof_da7219_mx98373");
diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index a539b65ba254..6695168e01f6 100644
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -32,7 +32,7 @@ static struct snd_soc_acpi_codecs mx98360a_spk = {
 struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	{
 		.id = "DLGS7219",
-		.drv_name = "sof_da7219_max98373",
+		.drv_name = "sof_da7219_mx98373",
 		.sof_fw_filename = "sof-jsl.ri",
 		.sof_tplg_filename = "sof-jsl-da7219.tplg",
 		.machine_quirk = snd_soc_acpi_codec_list,
@@ -40,7 +40,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "sof_da7219_max98360a",
+		.drv_name = "sof_da7219_mx98360a",
 		.sof_fw_filename = "sof-jsl.ri",
 		.sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg",
 	},

[PATCH linux-5.10.y 5/5] ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard

[Michał Górny]

From: Brent Lu <brent.lu@intel.com>

commit 0f32d9eb38c13c32895b5bf695eac639cee02d6c upstream.

The default codec for speaker amp's DAI Link is max98373 and will be
overwritten in probe function if the board id is sof_da7219_mx98360a.
However, the probe function does not do it because the board id is
changed in earlier commit.

Fixes: 1cc04d195dc2 ("ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters")
Signed-off-by: Brent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/20210726094525.5748-1-brent.lu@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/sof_da7219_max98373.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c
index 387bc8c962d9..16930cab4e28 100644
--- a/sound/soc/intel/boards/sof_da7219_max98373.c
+++ b/sound/soc/intel/boards/sof_da7219_max98373.c
@@ -404,7 +404,7 @@ static int audio_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	/* By default dais[0] is configured for max98373 */
-	if (!strcmp(pdev->name, "sof_da7219_max98360a")) {
+	if (!strcmp(pdev->name, "sof_da7219_mx98360a")) {
 		dais[0] = (struct snd_soc_dai_link) {
 			.name = "SSP1-Codec",
 			.id = 0,

Re: [PATCH linux-5.10.y 1/5] ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters

[Greg KH]

On Mon, Sep 01, 2025 at 11:54:36AM +0200, Michał Górny wrote:
> From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> 
> commit 24e46fb811e991f56d5694b10ae7ceb8d2b8c846 upstream.
> 
> The excessive platform id lengths are causing out-of-buffer reads
> in depmod, e.g.:
> 
> depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
> platform:jsl_rt5682_max98360ax�
> 
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Link: https://lore.kernel.org/r/20210511213707.32958-5-pierre-louis.bossart@linux.intel.com
> Signed-off-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Michał Górny <mgorny@gentoo.org>

This commit text does not match the upstream commit text at all :(

Same for others in this series, please fix.

thanks,

greg k-h

Re: [PATCH linux-5.10.y 1/5] ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

On Mon, 2025-09-01 at 15:25 +0200, Greg KH wrote:
> On Mon, Sep 01, 2025 at 11:54:36AM +0200, Michał Górny wrote:
> > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> > 
> > commit 24e46fb811e991f56d5694b10ae7ceb8d2b8c846 upstream.
> > 
> > The excessive platform id lengths are causing out-of-buffer reads
> > in depmod, e.g.:
> > 
> > depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
> > platform:jsl_rt5682_max98360ax�
> > 
> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> > Link: https://lore.kernel.org/r/20210511213707.32958-5-pierre-louis.bossart@linux.intel.com
> > Signed-off-by: Mark Brown <broonie@kernel.org>
> > Signed-off-by: Michał Górny <mgorny@gentoo.org>
> 
> This commit text does not match the upstream commit text at all :(
> 
> Same for others in this series, please fix.

I'm sorry, I've misread the instructions as telling me to describe why I
believe this deserves to be backported.  It would be really helpful if
they linked to some good examples.  Should I also keep the original
Reviewed-by lines?

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

Re: [PATCH linux-5.10.y 1/5] ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters

[Greg KH]

On Mon, Sep 01, 2025 at 03:55:29PM +0200, Michał Górny wrote:
> On Mon, 2025-09-01 at 15:25 +0200, Greg KH wrote:
> > On Mon, Sep 01, 2025 at 11:54:36AM +0200, Michał Górny wrote:
> > > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> > > 
> > > commit 24e46fb811e991f56d5694b10ae7ceb8d2b8c846 upstream.
> > > 
> > > The excessive platform id lengths are causing out-of-buffer reads
> > > in depmod, e.g.:
> > > 
> > > depmod: FATAL: Module index: bad character '�'=0x80 - only 7-bit ASCII is supported:
> > > platform:jsl_rt5682_max98360ax�
> > > 
> > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> > > Link: https://lore.kernel.org/r/20210511213707.32958-5-pierre-louis.bossart@linux.intel.com
> > > Signed-off-by: Mark Brown <broonie@kernel.org>
> > > Signed-off-by: Michał Górny <mgorny@gentoo.org>
> > 
> > This commit text does not match the upstream commit text at all :(
> > 
> > Same for others in this series, please fix.
> 
> I'm sorry, I've misread the instructions as telling me to describe why I
> believe this deserves to be backported.  It would be really helpful if
> they linked to some good examples.  Should I also keep the original
> Reviewed-by lines?

Yes, keep the original stuff, and if you need extra justification, put
that in a 0/X email header.

thanks,

greg k-h

[PATCH v2 linux-5.10.y 1/5] ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 characters

[Michał Górny]

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

commit 24e46fb811e991f56d5694b10ae7ceb8d2b8c846 upstream.

Sparse throwns the following warnings:

sound/soc/intel/boards/bxt_da7219_max98357a.c:843:19: error: too long
initializer-string for array of char(no space for nul char)

sound/soc/intel/boards/bxt_da7219_max98357a.c:844:19: error: too long
initializer-string for array of char(no space for nul char)

sound/soc/intel/boards/bxt_da7219_max98357a.c:845:19: error: too long
initializer-string for array of char(no space for nul char)

Fix by using the 'mx' acronyn for Maxim

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Paul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20210511213707.32958-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/bxt_da7219_max98357a.c     | 12 ++++++------
 sound/soc/intel/common/soc-acpi-intel-bxt-match.c |  2 +-
 sound/soc/intel/common/soc-acpi-intel-cml-match.c |  2 +-
 sound/soc/intel/common/soc-acpi-intel-glk-match.c |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 1a24c44db6dd..85738fd20b22 100644
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -840,9 +840,9 @@ static int broxton_audio_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bxt_board_ids[] = {
-	{ .name = "bxt_da7219_max98357a" },
-	{ .name = "glk_da7219_max98357a" },
-	{ .name = "cml_da7219_max98357a" },
+	{ .name = "bxt_da7219_mx98357a" },
+	{ .name = "glk_da7219_mx98357a" },
+	{ .name = "cml_da7219_mx98357a" },
 	{ }
 };
 
@@ -866,6 +866,6 @@ MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
 MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");
 MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:bxt_da7219_max98357a");
-MODULE_ALIAS("platform:glk_da7219_max98357a");
-MODULE_ALIAS("platform:cml_da7219_max98357a");
+MODULE_ALIAS("platform:bxt_da7219_mx98357a");
+MODULE_ALIAS("platform:glk_da7219_mx98357a");
+MODULE_ALIAS("platform:cml_da7219_mx98357a");
diff --git a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
index 32f77e29c2ff..d467663f6757 100644
--- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
@@ -56,7 +56,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "bxt_da7219_max98357a",
+		.drv_name = "bxt_da7219_mx98357a",
 		.fw_filename = "intel/dsp_fw_bxtn.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &bxt_codecs,
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 9b85811ffd51..43bba5670ab1 100644
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -54,7 +54,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 = &max98357a_spk_codecs,
 		.sof_fw_filename = "sof-cml.ri",
diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
index 26cb3b16cdd3..ac8f77d0afa9 100644
--- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
@@ -24,7 +24,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "glk_da7219_max98357a",
+		.drv_name = "glk_da7219_mx98357a",
 		.fw_filename = "intel/dsp_fw_glk.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &glk_codecs,

[PATCH v2 linux-5.10.y 2/5] ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters

[Michał Górny]

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

commit 590cfb082837cc6c0c595adf1711330197c86a58 upstream.

Some Chromebooks machine driver aliases exceed 20 characters, which
leads to sparse warnings:

sound/soc/intel/boards/sof_rt5682.c:959:25: error: too long
initializer-string for array of char(no space for nul char)

sound/soc/intel/boards/sof_rt5682.c:989:25: error: too long
initializer-string for array of char(no space for nul char)

sound/soc/intel/boards/sof_rt5682.c:1039:25: error: too long
initializer-string for array of char(no space for nul char)

Fix by using the 'mx' shortcut for Maxim platforms (already used in
platform firmware)

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Paul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20210621194057.21711-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/sof_rt5682.c               | 12 ++++++------
 sound/soc/intel/common/soc-acpi-intel-jsl-match.c |  2 +-
 sound/soc/intel/common/soc-acpi-intel-tgl-match.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 5883d1fa3b7e..414dc594014d 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -844,7 +844,7 @@ static const struct platform_device_id board_ids[] = {
 		.name = "sof_rt5682",
 	},
 	{
-		.name = "tgl_max98357a_rt5682",
+		.name = "tgl_mx98357a_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -861,7 +861,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_RT5682_SSP_AMP(1)),
 	},
 	{
-		.name = "tgl_max98373_rt5682",
+		.name = "tgl_mx98373_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -870,7 +870,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_RT5682_NUM_HDMIDEV(4)),
 	},
 	{
-		.name = "jsl_rt5682_max98360a",
+		.name = "jsl_rt5682_mx98360a",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_MCLK_24MHZ |
 					SOF_RT5682_SSP_CODEC(0) |
@@ -898,7 +898,7 @@ MODULE_AUTHOR("Bard Liao <bard.liao@intel.com>");
 MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:sof_rt5682");
-MODULE_ALIAS("platform:tgl_max98357a_rt5682");
+MODULE_ALIAS("platform:tgl_mx98357a_rt5682");
 MODULE_ALIAS("platform:jsl_rt5682_rt1015");
-MODULE_ALIAS("platform:tgl_max98373_rt5682");
-MODULE_ALIAS("platform:jsl_rt5682_max98360a");
+MODULE_ALIAS("platform:tgl_mx98373_rt5682");
+MODULE_ALIAS("platform:jsl_rt5682_mx98360a");
diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index 34f5fcad5701..a539b65ba254 100644
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -54,7 +54,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "jsl_rt5682_max98360a",
+		.drv_name = "jsl_rt5682_mx98360a",
 		.sof_fw_filename = "sof-jsl.ri",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &mx98360a_spk,
diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 15d862cdcd2f..f7c491eba1e7 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -321,7 +321,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "tgl_max98357a_rt5682",
+		.drv_name = "tgl_mx98357a_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &tgl_codecs,
 		.sof_fw_filename = "sof-tgl.ri",
@@ -329,7 +329,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "tgl_max98373_rt5682",
+		.drv_name = "tgl_mx98373_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &tgl_max98373_amp,
 		.sof_fw_filename = "sof-tgl.ri",

[PATCH v2 linux-5.10.y 3/5] ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 characters

[Michał Górny]

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

commit bc47256afef38175a0ad6bcfd4dbab9d2c65b377 upstream.

Sparse throws the following warning:

sound/soc/intel/boards/glk_rt5682_max98357a.c:622:25: error: too long
initializer-string for array of char(no space for nul char)

Fix by using the 'mx' acronym for Maxim

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Paul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20210621194057.21711-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/glk_rt5682_max98357a.c     | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-glk-match.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c
index c1b789ac6d50..005bd96175cf 100644
--- a/sound/soc/intel/boards/glk_rt5682_max98357a.c
+++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c
@@ -621,7 +621,7 @@ static int geminilake_audio_probe(struct platform_device *pdev)
 
 static const struct platform_device_id glk_board_ids[] = {
 	{
-		.name = "glk_rt5682_max98357a",
+		.name = "glk_rt5682_mx98357a",
 		.driver_data =
 			(kernel_ulong_t)&glk_audio_card_rt5682_m98357a,
 	},
@@ -643,4 +643,4 @@ MODULE_DESCRIPTION("Geminilake Audio Machine driver-RT5682 & MAX98357A in I2S mo
 MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
 MODULE_AUTHOR("Harsha Priya <harshapriya.n@intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:glk_rt5682_max98357a");
+MODULE_ALIAS("platform:glk_rt5682_mx98357a");
diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
index ac8f77d0afa9..e05db22d860c 100644
--- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
@@ -33,7 +33,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "glk_rt5682_max98357a",
+		.drv_name = "glk_rt5682_mx98357a",
 		.fw_filename = "intel/dsp_fw_glk.bin",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &glk_codecs,

[PATCH v2 linux-5.10.y 4/5] ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters

[Michał Górny]

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

commit 1cc04d195dc245457a45df60e6558b460b8e4c71 upstream.

Sparse throws the following warning:

sound/soc/intel/boards/sof_da7219_max98373.c:438:25: error: too long
initializer-string for array of char(no space for nul char)

Fix by using 'mx' acronym for Maxim.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Paul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20210621194057.21711-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/sof_da7219_max98373.c      | 8 ++++----
 sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c
index 8d1ad892e86b..387bc8c962d9 100644
--- a/sound/soc/intel/boards/sof_da7219_max98373.c
+++ b/sound/soc/intel/boards/sof_da7219_max98373.c
@@ -431,11 +431,11 @@ static int audio_probe(struct platform_device *pdev)
 
 static const struct platform_device_id board_ids[] = {
 	{
-		.name = "sof_da7219_max98373",
+		.name = "sof_da7219_mx98373",
 		.driver_data = (kernel_ulong_t)&card_da7219_m98373,
 	},
 	{
-		.name = "sof_da7219_max98360a",
+		.name = "sof_da7219_mx98360a",
 		.driver_data = (kernel_ulong_t)&card_da7219_m98360a,
 	},
 	{ }
@@ -456,5 +456,5 @@ module_platform_driver(audio)
 MODULE_DESCRIPTION("ASoC Intel(R) SOF Machine driver");
 MODULE_AUTHOR("Yong Zhi <yong.zhi@intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:sof_da7219_max98360a");
-MODULE_ALIAS("platform:sof_da7219_max98373");
+MODULE_ALIAS("platform:sof_da7219_mx98360a");
+MODULE_ALIAS("platform:sof_da7219_mx98373");
diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index a539b65ba254..6695168e01f6 100644
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -32,7 +32,7 @@ static struct snd_soc_acpi_codecs mx98360a_spk = {
 struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	{
 		.id = "DLGS7219",
-		.drv_name = "sof_da7219_max98373",
+		.drv_name = "sof_da7219_mx98373",
 		.sof_fw_filename = "sof-jsl.ri",
 		.sof_tplg_filename = "sof-jsl-da7219.tplg",
 		.machine_quirk = snd_soc_acpi_codec_list,
@@ -40,7 +40,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "DLGS7219",
-		.drv_name = "sof_da7219_max98360a",
+		.drv_name = "sof_da7219_mx98360a",
 		.sof_fw_filename = "sof-jsl.ri",
 		.sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg",
 	},

[PATCH v2 linux-5.10.y 5/5] ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard

[Michał Górny]

From: Brent Lu <brent.lu@intel.com>

commit 0f32d9eb38c13c32895b5bf695eac639cee02d6c upstream.

The default codec for speaker amp's DAI Link is max98373 and will be
overwritten in probe function if the board id is sof_da7219_mx98360a.
However, the probe function does not do it because the board id is
changed in earlier commit.

Fixes: 1cc04d195dc2 ("ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters")
Signed-off-by: Brent Lu <brent.lu@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210726094525.5748-1-brent.lu@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 sound/soc/intel/boards/sof_da7219_max98373.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c
index 387bc8c962d9..16930cab4e28 100644
--- a/sound/soc/intel/boards/sof_da7219_max98373.c
+++ b/sound/soc/intel/boards/sof_da7219_max98373.c
@@ -404,7 +404,7 @@ static int audio_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	/* By default dais[0] is configured for max98373 */
-	if (!strcmp(pdev->name, "sof_da7219_max98360a")) {
+	if (!strcmp(pdev->name, "sof_da7219_mx98360a")) {
 		dais[0] = (struct snd_soc_dai_link) {
 			.name = "SSP1-Codec",
 			.id = 0,