From: Ethan Nelson-Moore Date: Sun, 10 May 2026 22:14:00 +0000 (-0700) Subject: ASoC: fsl: eukrea-tlv320: update board checks to use the DT X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=3760befa5c08b229df76ab458520beeb26024716;p=thirdparty%2Fkernel%2Flinux.git ASoC: fsl: eukrea-tlv320: update board checks to use the DT The eukrea-tlv320 driver contains checks for ARM machine IDs via machine_is_*() macros. The boards concerned now support only FDT booting, which does not use machine IDs, and therefore the code should be updated to check the DT compatible property instead. Non-DT booting support for these machines was removed in these commits: commit f2f55499942a ("ARM: imx: Remove eukrea_mbimxsd35 non-dt support") commit 3877942b0c7f ("ARM: imx25: Remove eukrea mx25 board files") commit 7c5deaf77526 ("ARM: i.MX: Remove mach-cpuimx27sd board file") commit 8da4d6b2f798 ("ARM: mx51: Remove mach-cpuimx51sd board file") The presence of these machine ID checks prevents the removal of machine IDs no longer used by the kernel from arch/arm/tools/mach-types, because the machine_is_*() macros are generated from mach-types. To resolve this issue, use of_machine_is_compatible() instead. Signed-off-by: Ethan Nelson-Moore Link: https://patch.msgid.link/20260510221403.11283-1-enelsonmoore@gmail.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index 6be074ea0b3f..5bb31a5cdf23 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -19,7 +19,6 @@ #include #include #include -#include #include "../codecs/tlv320aic23.h" #include "imx-ssi.h" @@ -142,7 +141,7 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) eukrea_tlv320.name = "cpuimx-audio"; } - if (machine_is_eukrea_cpuimx27() || + if (of_machine_is_compatible("eukrea,cpuimx27") || (tmp_np = of_find_compatible_node(NULL, NULL, "fsl,imx21-audmux"))) { imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, IMX_AUDMUX_V1_PCR_SYN | @@ -159,12 +158,12 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) ); of_node_put(tmp_np); - } else if (machine_is_eukrea_cpuimx25sd() || - machine_is_eukrea_cpuimx35sd() || - machine_is_eukrea_cpuimx51sd() || + } else if (of_machine_is_compatible("eukrea,cpuimx25") || + of_machine_is_compatible("eukrea,cpuimx35") || + of_machine_is_compatible("eukrea,cpuimx51") || (tmp_np = of_find_compatible_node(NULL, NULL, "fsl,imx31-audmux"))) { if (!np) - ext_port = machine_is_eukrea_cpuimx25sd() ? + ext_port = of_machine_is_compatible("eukrea,cpuimx25") ? 4 : 3; imx_audmux_v2_configure_port(int_port,