[PATCH] sound: soc: fsl: eukrea-tlv320: update board checks to use the DT

[PATCH] sound: soc: fsl: eukrea-tlv320: update board checks to use the DT

[Ethan Nelson-Moore]

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 <enelsonmoore@gmail.com>
---
 sound/soc/fsl/eukrea-tlv320.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index 6be074ea0b3f..2e6abd620571 100644
--- a/sound/soc/fsl/eukrea-tlv320.c
+++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -142,7 +142,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 +159,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,
-- 
2.43.0

Re: [PATCH] sound: soc: fsl: eukrea-tlv320: update board checks to use the DT

[Mark Brown]

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

On Sat, May 09, 2026 at 02:46:19PM -0700, Ethan Nelson-Moore wrote:
> 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.

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] sound: soc: fsl: eukrea-tlv320: update board checks to use the DT

[Mark Brown]

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

On Sat, May 09, 2026 at 02:46:19PM -0700, Ethan Nelson-Moore wrote:

> index 6be074ea0b3f..2e6abd620571 100644
> --- a/sound/soc/fsl/eukrea-tlv320.c
> +++ b/sound/soc/fsl/eukrea-tlv320.c
> @@ -142,7 +142,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") ||

This renders the inclusion of asm/mach-types.h redundant.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] sound: soc: fsl: eukrea-tlv320: update board checks to use the DT

[Ethan Nelson-Moore]

Hi, Mark,

On Sun, May 10, 2026 at 5:57 AM Mark Brown <broonie@kernel.org> wrote:
> This renders the inclusion of asm/mach-types.h redundant.

Good point. I removed it in other drivers but missed it here, I'll
resend the patch with this fixed.

Ethan