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

[PATCH v3] 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.

Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> # v2
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
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
Changes from v2: Correct changelog formatting (there were two ---
sections in v2)

 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 v3] ASoC: ti: omap3pandora: update board check to use DT compatible

[Mark Brown]

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

On Sat, May 16, 2026 at 07:37:22PM -0700, Ethan Nelson-Moore wrote:
> 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

Please do not submit new versions of already applied patches, please
submit incremental updates to the existing code.  Modifying existing
commits creates problems for other users building on top of those
commits so it's best practice to only change pubished git commits if
absolutely essential.

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

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

[Ethan Nelson-Moore]

On Tue, May 19, 2026 at 2:02 AM Mark Brown <broonie@kernel.org> wrote:
> On Sat, May 16, 2026 at 07:37:22PM -0700, Ethan Nelson-Moore wrote:
> Please do not submit new versions of already applied patches, please
> submit incremental updates to the existing code.  Modifying existing
> commits creates problems for other users building on top of those
> commits so it's best practice to only change pubished git commits if
> absolutely essential.

Hi, Mark,

I didn't intend to do that - I resent the patch because I hadn't
gotten a response regarding whether it would be fixed up manually or I
should resend it. Next time that happens, I'll check to make sure it
wasn't applied first. Sorry for the confusion.

Ethan