[PATCH v2] ASoC: ti: omap3pandora: update board check to use DT compatible

[PATCH v2] ASoC: ti: omap3pandora: update board check to use DT compatible

[Ethan Nelson-Moore]

The omap3pandora driver contains a check for the ARM machine ID via the
machine_is_omap3_pandora() macro. The board concerned now supports
only FDT booting, which does not use machine IDs, and therefore the
code should be updated to check the DT compatible property instead. The
legacy board file for this machine was removed in commit 7fcf7e061edd
("ARM: OMAP2+: Remove legacy booting support for Pandora").
The presence of this machine ID check 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.
---
Changes from v1: Fix mistake in commit message and remove Fixes tags -
machine ID checks still work with DT booting if the bootloader passes
the ID

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
 sound/soc/ti/omap3pandora.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/ti/omap3pandora.c b/sound/soc/ti/omap3pandora.c
index f11b1d8a1306..6c9c184cd9d6 100644
--- a/sound/soc/ti/omap3pandora.c
+++ b/sound/soc/ti/omap3pandora.c
@@ -11,12 +11,12 @@
 #include <linux/delay.h>
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
+#include <linux/of.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 
-#include <asm/mach-types.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
@@ -225,7 +225,8 @@ static int __init omap3pandora_soc_init(void)
 {
 	int ret;
 
-	if (!machine_is_omap3_pandora())
+	if (!of_machine_is_compatible("openpandora,omap3-pandora-600mhz") &&
+		!of_machine_is_compatible("openpandora,omap3-pandora-1ghz"))
 		return -ENODEV;
 
 	pr_info("OMAP3 Pandora SoC init\n");
-- 
2.43.0

Re: [PATCH v2] ASoC: ti: omap3pandora: update board check to use DT compatible

[Ethan Nelson-Moore]

On Sat, May 9, 2026 at 10:40 PM Ethan Nelson-Moore
<enelsonmoore@gmail.com> wrote:
> ---
> Changes from v1: Fix mistake in commit message and remove Fixes tags -
> machine ID checks still work with DT booting if the bootloader passes
> the ID
>
> Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
> ---

I forgot to move my changelog below the --- generated by git
format-patch. Sorry. Could whoever merges this fix that, or should I
resend this patch tomorrow?

Re: [PATCH v2] ASoC: ti: omap3pandora: update board check to use DT compatible

[Jarkko Nikula]

On 10/05/2026 8:47 am, Ethan Nelson-Moore wrote:
> On Sat, May 9, 2026 at 10:40 PM Ethan Nelson-Moore
> <enelsonmoore@gmail.com> wrote:
>> ---
>> Changes from v1: Fix mistake in commit message and remove Fixes tags -
>> machine ID checks still work with DT booting if the bootloader passes
>> the ID
>>
>> Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
>> ---
> I forgot to move my changelog below the --- generated by git
> format-patch. Sorry. Could whoever merges this fix that, or should I
> resend this patch tomorrow?

You may add if plan to resend:

Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>