From: Greg Kroah-Hartman Date: Thu, 4 Sep 2025 12:04:42 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.4.298~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fc095c2a93ec58b12a202d92a356e676ec4e65c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: asoc-intel-sof_da7219_max98373-shrink-platform_id-below-20-characters.patch --- diff --git a/queue-5.10/asoc-intel-sof_da7219_max98373-shrink-platform_id-below-20-characters.patch b/queue-5.10/asoc-intel-sof_da7219_max98373-shrink-platform_id-below-20-characters.patch new file mode 100644 index 0000000000..66b532d7cf --- /dev/null +++ b/queue-5.10/asoc-intel-sof_da7219_max98373-shrink-platform_id-below-20-characters.patch @@ -0,0 +1,73 @@ +From 1cc04d195dc245457a45df60e6558b460b8e4c71 Mon Sep 17 00:00:00 2001 +From: Pierre-Louis Bossart +Date: Mon, 21 Jun 2021 14:40:53 -0500 +Subject: ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters + +From: Pierre-Louis Bossart + +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 +Reviewed-by: Paul Olaru +Reviewed-by: Guennadi Liakhovetski +Reviewed-by: Rander Wang +Link: https://lore.kernel.org/r/20210621194057.21711-7-pierre-louis.bossart@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Michał Górny +Signed-off-by: Greg Kroah-Hartman +--- + 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(-) + +--- 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_d + + 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 "); + 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"); +--- 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 mx9836 + 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_in + }, + { + .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/queue-5.10/series b/queue-5.10/series index fdc7bea663..04efe0c01f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -30,5 +30,6 @@ revert-drm-dp-change-aux-dpcd-probe-address-from-dpcd_rev-to-lane0_1_status.patc asoc-intel-bxt_da7219_max98357a-shrink-platform_id-below-20-characters.patch asoc-intel-sof_rt5682-shrink-platform_id-names-below-20-characters.patch asoc-intel-glk_rt5682_max98357a-shrink-platform_id-below-20-characters.patch +asoc-intel-sof_da7219_max98373-shrink-platform_id-below-20-characters.patch asoc-intel-sof_da7219_mx98360a-fail-to-initialize-soundcard.patch xfs-do-not-propagate-enodata-disk-errors-into-xattr-code.patch