From: Kory Maincent <kory.maincent@bootlin.com>
To: Tony Lindgren <tony@atomide.com>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Andreas Kemnade <andreas@kemnade.info>,
Kevin Hilman <khilman@baylibre.com>,
Roger Quadros <rogerq@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Paul Barker <paul.barker@sancloud.com>,
Marc Murphy <marc.murphy@sancloud.com>
Cc: Jason Kridner <jkridner@gmail.com>, Andrew Davis <afd@ti.com>,
Bajjuri Praneeth <praneeth@ti.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Kory Maincent <kory.maincent@bootlin.com>
Subject: [PATCH v4 2/7] arm: dts: omap: Remove incorrect compatible strings from device trees
Date: Tue, 17 Jun 2025 13:59:25 +0200 [thread overview]
Message-ID: <20250617-bbg-v4-2-827cbd606db6@bootlin.com> (raw)
In-Reply-To: <20250617-bbg-v4-0-827cbd606db6@bootlin.com>
Several device trees incorrectly included extraneous compatible strings
in their compatible property lists. The policy is to only describe the
specific board name and SoC name to avoid confusion.
Remove these incorrect compatible strings to fix the inconsistency.
Also fix board vendor prefixes for BeagleBoard variants that were
incorrectly using "ti" instead of "beagle" or "seeed".
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Changes in v4:
- Rename ti,am335x-shc to bosch,am335x-shc
- Drop model value change to avoid conflict with script based on this
value like:
https://salsa.debian.org/installer-team/flash-kernel/-/blob/master/db/all.db?ref_type=heads
Changes in v3:
- Remove extraneous compatible strings.
- Replace BeagleBone board name vendor.
Changes in v2:
- New patch
---
arch/arm/boot/dts/ti/omap/am335x-base0033.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-bone.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-boneblack.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts | 3 +--
arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-extended-wifi.dts | 5 +----
arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-lite.dts | 5 +----
arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe.dts | 2 +-
arch/arm/boot/dts/ti/omap/am335x-shc.dts | 2 +-
15 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boot/dts/ti/omap/am335x-base0033.dts b/arch/arm/boot/dts/ti/omap/am335x-base0033.dts
index 46078af4b7a3..176de29de2a6 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-base0033.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-base0033.dts
@@ -9,7 +9,7 @@
/ {
model = "IGEP COM AM335x on AQUILA Expansion";
- compatible = "isee,am335x-base0033", "isee,am335x-igep0033", "ti,am33xx";
+ compatible = "isee,am335x-base0033", "ti,am33xx";
hdmi {
compatible = "ti,tilcdc,slave";
diff --git a/arch/arm/boot/dts/ti/omap/am335x-bone.dts b/arch/arm/boot/dts/ti/omap/am335x-bone.dts
index b5d85ef51a02..08616d449f95 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-bone.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-bone.dts
@@ -9,7 +9,7 @@
/ {
model = "TI AM335x BeagleBone";
- compatible = "ti,am335x-bone", "ti,am33xx";
+ compatible = "beagle,am335x-bone", "ti,am33xx";
};
&ldo3_reg {
diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts
index b4b4b80df08c..aa668dfa1c6a 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts
@@ -12,7 +12,7 @@
/ {
model = "TI AM335x BeagleBone Black Wireless";
- compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+ compatible = "beagle,am335x-bone-black-wireless", "ti,am33xx";
wlan_en_reg: fixedregulator@2 {
compatible = "regulator-fixed";
diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts b/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts
index 16b567e3cb47..476fb6677203 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts
@@ -11,7 +11,7 @@
/ {
model = "TI AM335x BeagleBone Black";
- compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+ compatible = "beagle,am335x-bone-black", "ti,am33xx";
};
&cpu0_opp_table {
diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
index f579df4c2c54..56f9042a5bfb 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
@@ -10,7 +10,7 @@
/ {
model = "TI AM335x BeagleBone Blue";
- compatible = "ti,am335x-bone-blue", "ti,am33xx";
+ compatible = "beagle,am335x-bone-blue", "ti,am33xx";
chosen {
stdout-path = &uart0;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts
index a4f5b5262645..37d4d5a3edf6 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts
@@ -11,7 +11,7 @@
/ {
model = "TI AM335x BeagleBone Green Wireless";
- compatible = "ti,am335x-bone-green-wireless", "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+ compatible = "seeed,am335x-bone-green-wireless", "ti,am33xx";
wlan_en_reg: fixedregulator@2 {
compatible = "regulator-fixed";
diff --git a/arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts b/arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts
index 18cc0f49e999..3d6404653816 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts
@@ -10,5 +10,5 @@
/ {
model = "TI AM335x BeagleBone Green";
- compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+ compatible = "seeed,am335x-bone-green", "ti,am33xx";
};
diff --git a/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts b/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts
index 648e97fe1dfd..224095304ef3 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts
@@ -8,8 +8,7 @@
/ {
model = "AM335x Chiliboard";
- compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom",
- "ti,am33xx";
+ compatible = "grinn,am335x-chiliboard", "ti,am33xx";
chosen {
stdout-path = &uart0;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts b/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts
index fd91a3c01a63..55a454f51148 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts
@@ -12,7 +12,7 @@
/ {
model = "MYIR MYD-AM335X";
- compatible = "myir,myd-am335x", "myir,myc-am335x", "ti,am33xx";
+ compatible = "myir,myd-am335x", "ti,am33xx";
chosen {
stdout-path = &uart0;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts b/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts
index d28d39728847..d87ac31a16a9 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts
@@ -16,7 +16,7 @@
/ {
model = "Octavo Systems OSD3358-SM-RED";
- compatible = "oct,osd3358-sm-refdesign", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+ compatible = "oct,osd3358-sm-refdesign", "ti,am33xx";
};
&ldo3_reg {
diff --git a/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts b/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts
index 78ce860e59b3..908203fd9190 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts
@@ -12,7 +12,7 @@
/ {
model = "TI AM335x PocketBeagle";
- compatible = "ti,am335x-pocketbeagle", "ti,am335x-bone", "ti,am33xx";
+ compatible = "beagle,am335x-pocketbeagle", "ti,am33xx";
chosen {
stdout-path = &uart0;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-extended-wifi.dts b/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-extended-wifi.dts
index 7c9f65126c63..61210f975542 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-extended-wifi.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-extended-wifi.dts
@@ -13,10 +13,7 @@
/ {
model = "SanCloud BeagleBone Enhanced Extended WiFi";
- compatible = "sancloud,am335x-boneenhanced",
- "ti,am335x-bone-black",
- "ti,am335x-bone",
- "ti,am33xx";
+ compatible = "sancloud,am335x-boneenhanced", "ti,am33xx";
wlan_en_reg: fixedregulator@2 {
compatible = "regulator-fixed";
diff --git a/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-lite.dts b/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-lite.dts
index c6c96f6182a8..10488b55689c 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-lite.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-lite.dts
@@ -12,10 +12,7 @@
/ {
model = "SanCloud BeagleBone Enhanced Lite";
- compatible = "sancloud,am335x-boneenhanced",
- "ti,am335x-bone-black",
- "ti,am335x-bone",
- "ti,am33xx";
+ compatible = "sancloud,am335x-boneenhanced", "ti,am33xx";
};
&am33xx_pinmux {
diff --git a/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe.dts
index 32669346cefe..f1bdbf053fb2 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe.dts
@@ -13,7 +13,7 @@
/ {
model = "SanCloud BeagleBone Enhanced";
- compatible = "sancloud,am335x-boneenhanced", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+ compatible = "sancloud,am335x-boneenhanced", "ti,am33xx";
};
&am33xx_pinmux {
diff --git a/arch/arm/boot/dts/ti/omap/am335x-shc.dts b/arch/arm/boot/dts/ti/omap/am335x-shc.dts
index 597482822608..47b1db476cf3 100644
--- a/arch/arm/boot/dts/ti/omap/am335x-shc.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-shc.dts
@@ -12,7 +12,7 @@
/ {
model = "Bosch SHC";
- compatible = "ti,am335x-shc", "ti,am335x-bone", "ti,am33xx";
+ compatible = "bosch,am335x-shc", "ti,am33xx";
aliases {
mmcblk0 = &mmc1;
--
2.43.0
next prev parent reply other threads:[~2025-06-17 11:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-17 11:59 [PATCH v4 0/7] Add support for BeagleBone Green Eco board Kory Maincent
2025-06-17 11:59 ` [PATCH v4 1/7] dt-bindings: omap: Add missing AM33xx compatible strings Kory Maincent
2025-06-17 15:48 ` Conor Dooley
2025-06-17 11:59 ` Kory Maincent [this message]
2025-06-18 20:41 ` [PATCH v4 2/7] arm: dts: omap: Remove incorrect compatible strings from device trees Kevin Hilman
2025-06-19 8:13 ` Kory Maincent
2025-06-19 11:28 ` Andreas Kemnade
2025-06-17 11:59 ` [PATCH v4 3/7] arm: dts: omap: am335x-bone-common: Rename tps to generic pmic node Kory Maincent
2025-06-17 11:59 ` [PATCH v4 4/7] dt-bindings: omap: Add Seeed BeagleBone Green Eco Kory Maincent
2025-06-17 11:59 ` [PATCH v4 5/7] arm: dts: omap: Add support for BeagleBone Green Eco board Kory Maincent
2025-06-17 11:59 ` [PATCH v4 6/7] arm: omap2plus_defconfig: Enable TPS65219 regulator Kory Maincent
2025-06-17 11:59 ` [PATCH v4 7/7] arm: multi_v7_defconfig: " Kory Maincent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250617-bbg-v4-2-827cbd606db6@bootlin.com \
--to=kory.maincent@bootlin.com \
--cc=aaro.koskinen@iki.fi \
--cc=afd@ti.com \
--cc=andreas@kemnade.info \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jkridner@gmail.com \
--cc=khilman@baylibre.com \
--cc=krzk+dt@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=marc.murphy@sancloud.com \
--cc=paul.barker@sancloud.com \
--cc=praneeth@ti.com \
--cc=robh@kernel.org \
--cc=rogerq@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).