commit:     c87676c6285a4f1640115a672a068c5ba88d3b26
Author:     Arisu Tachibana <alicef <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 09:08:08 2025 +0000
Commit:     Arisu Tachibana <alicef <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 09:08:08 2025 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=c87676c6

Add asoc intel soundcard patches for long platform_id

Signed-off-by: Arisu Tachibana <alicef <AT> gentoo.org>

 0000_README                                        |  20 ++++
 ...sof_rt5682_shrink_platform_id_names_below.patch | 115 +++++++++++++++++++++
 ...sof_da7219_max98373_shrink_platform_id_be.patch |  76 ++++++++++++++
 ...bxt_da7219_max98357a_shrink_platform_id_b.patch | 102 ++++++++++++++++++
 ...glk_rt5682_max98357a_shrink_platform_id_b.patch |  60 +++++++++++
 ...7219_mx98360a_fail_to_initilize_soundcard.patch |  37 +++++++
 6 files changed, 410 insertions(+)

diff --git a/0000_README b/0000_README
index 24501f38..85328d8b 100644
--- a/0000_README
+++ b/0000_README
@@ -1023,6 +1023,26 @@ Patch:  
2010_Fix_randomize_layout_crash_in_struct_neigh.patch
 From:   
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=45b3fae4675d
 Desc:   neighbour: Fix __randomize_layout crash in struct neighbour
 
+Patch:  2700_asoc_intel_sof_rt5682_shrink_platform_id_names_below.patch
+From:   
https://lore.kernel.org/all/[email protected]/
+Desc:   ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
+
+Patch:  2701_asoc_intel_sof_da7219_max98373_shrink_platform_id_be.patch
+From:   
https://lore.kernel.org/r/[email protected]
+Desc:   ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 
characters
+
+Patch:  2702_asoc_intel_bxt_da7219_max98357a_shrink_platform_id_b.patch
+From:   
https://lore.kernel.org/all/[email protected]/
+Desc:   ASoC: Intel: bxt_da7219_max98357a: shrink platform_id below 20 
characters
+
+Patch:  2703_asoc_intel_glk_rt5682_max98357a_shrink_platform_id_b.patch
+From:   
https://lore.kernel.org/all/[email protected]/
+Desc:   ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 
characters
+
+Patch:  2704_asoc_intel_sof_da7219_mx98360a_fail_to_initilize_soundcard.patch
+From:   https://lore.kernel.org/all/[email protected]/
+Desc:   ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard
+
 Patch:  2920_sign-file-patch-for-libressl.patch
 From:   https://bugs.gentoo.org/717166
 Desc:   sign-file: full functionality with modern LibreSSL

diff --git a/2700_asoc_intel_sof_rt5682_shrink_platform_id_names_below.patch 
b/2700_asoc_intel_sof_rt5682_shrink_platform_id_names_below.patch
new file mode 100644
index 00000000..cad6bddd
--- /dev/null
+++ b/2700_asoc_intel_sof_rt5682_shrink_platform_id_names_below.patch
@@ -0,0 +1,115 @@
+From 3c336d24c1645dff2ade5d56abf890f26c65d11f Mon Sep 17 00:00:00 2001
+From: Pierre-Louis Bossart <[email protected]>
+Date: Mon, 21 Jun 2021 14:40:50 -0500
+Subject: [PATCH 10/16] ASoC: Intel: sof_rt5682: shrink platform_id names below
+ 20 characters
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 <[email protected]>
+Reviewed-by: Paul Olaru <[email protected]>
+Reviewed-by: Guennadi Liakhovetski <[email protected]>
+Reviewed-by: Rander Wang <[email protected]>
+Link: 
https://lore.kernel.org/r/[email protected]
+Signed-off-by: Mark Brown <[email protected]>
+(rebased for 5.10)
+Signed-off-by: Michał Górny <[email protected]>
+---
+ 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 <[email protected]>");
+ MODULE_AUTHOR("Sathya Prakash M R <[email protected]>");
+ 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",

diff --git a/2701_asoc_intel_sof_da7219_max98373_shrink_platform_id_be.patch 
b/2701_asoc_intel_sof_da7219_max98373_shrink_platform_id_be.patch
new file mode 100644
index 00000000..abe11f82
--- /dev/null
+++ b/2701_asoc_intel_sof_da7219_max98373_shrink_platform_id_be.patch
@@ -0,0 +1,76 @@
+From 5eecfefa906ab8f0f9bae6782eec8f739e0bad33 Mon Sep 17 00:00:00 2001
+From: Pierre-Louis Bossart <[email protected]>
+Date: Mon, 21 Jun 2021 14:40:53 -0500
+Subject: [PATCH 11/16] ASoC: Intel: sof_da7219_max98373: shrink platform_id
+ below 20 characters
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 <[email protected]>
+Reviewed-by: Paul Olaru <[email protected]>
+Reviewed-by: Guennadi Liakhovetski <[email protected]>
+Reviewed-by: Rander Wang <[email protected]>
+Link: 
https://lore.kernel.org/r/[email protected]
+Signed-off-by: Mark Brown <[email protected]>
+Signed-off-by: Michał Górny <[email protected]>
+---
+ 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 <[email protected]>");
+ 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",
+       },

diff --git a/2702_asoc_intel_bxt_da7219_max98357a_shrink_platform_id_b.patch 
b/2702_asoc_intel_bxt_da7219_max98357a_shrink_platform_id_b.patch
new file mode 100644
index 00000000..0f28ecd4
--- /dev/null
+++ b/2702_asoc_intel_bxt_da7219_max98357a_shrink_platform_id_b.patch
@@ -0,0 +1,102 @@
+From 36281aaeef8e5e37f3cecb0e0590f2ce880eecd1 Mon Sep 17 00:00:00 2001
+From: Pierre-Louis Bossart <[email protected]>
+Date: Tue, 11 May 2021 16:37:02 -0500
+Subject: [PATCH 12/16] ASoC: Intel: bxt_da7219_max98357a: shrink platform_id
+ below 20 characters
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 <[email protected]>
+Reviewed-by: Paul Olaru <[email protected]>
+Reviewed-by: Guennadi Liakhovetski <[email protected]>
+Reviewed-by: Rander Wang <[email protected]>
+Link: 
https://lore.kernel.org/r/[email protected]
+Signed-off-by: Mark Brown <[email protected]>
+Signed-off-by: Michał Górny <[email protected]>
+---
+ 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 <[email protected]>");
+ MODULE_AUTHOR("Mac Chiang <[email protected]>");
+ MODULE_AUTHOR("Brent Lu <[email protected]>");
+ 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,

diff --git a/2703_asoc_intel_glk_rt5682_max98357a_shrink_platform_id_b.patch 
b/2703_asoc_intel_glk_rt5682_max98357a_shrink_platform_id_b.patch
new file mode 100644
index 00000000..649a2779
--- /dev/null
+++ b/2703_asoc_intel_glk_rt5682_max98357a_shrink_platform_id_b.patch
@@ -0,0 +1,60 @@
+From b746d5e79ad0a9d048c7a69648075067632d3b14 Mon Sep 17 00:00:00 2001
+From: Pierre-Louis Bossart <[email protected]>
+Date: Mon, 21 Jun 2021 14:40:51 -0500
+Subject: [PATCH 13/16] ASoC: Intel: glk_rt5682_max98357a: shrink platform_id
+ below 20 characters
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 <[email protected]>
+Reviewed-by: Paul Olaru <[email protected]>
+Reviewed-by: Guennadi Liakhovetski <[email protected]>
+Reviewed-by: Rander Wang <[email protected]>
+Link: 
https://lore.kernel.org/r/[email protected]
+Signed-off-by: Mark Brown <[email protected]>
+Signed-off-by: Michał Górny <[email protected]>
+---
+ 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 <[email protected]>");
+ MODULE_AUTHOR("Harsha Priya <[email protected]>");
+ 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,

diff --git 
a/2704_asoc_intel_sof_da7219_mx98360a_fail_to_initilize_soundcard.patch 
b/2704_asoc_intel_sof_da7219_mx98360a_fail_to_initilize_soundcard.patch
new file mode 100644
index 00000000..36cbcb18
--- /dev/null
+++ b/2704_asoc_intel_sof_da7219_mx98360a_fail_to_initilize_soundcard.patch
@@ -0,0 +1,37 @@
+From 91b0ad92d086bb1c2476b9256ff54308b578f255 Mon Sep 17 00:00:00 2001
+From: Brent Lu <[email protected]>
+Date: Mon, 26 Jul 2021 17:45:25 +0800
+Subject: [PATCH 14/16] ASoC: Intel: sof_da7219_mx98360a: fail to initialize
+ soundcard
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 <[email protected]>
+Acked-by: Pierre-Louis Bossart <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Mark Brown <[email protected]>
+Signed-off-by: Michał Górny <[email protected]>
+---
+ 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,

Reply via email to