diff mbox series

[v2,1/5] arm: dts: omap: Remove incorrect compatible strings from device trees

Message ID 20250609-bbg-v2-1-5278026b7498@bootlin.com
State New
Headers show
Series Add support for BeagleBone Green Eco board | expand

Commit Message

Kory Maincent June 9, 2025, 3:43 p.m. UTC
Several device trees incorrectly included ti,am335x-bone-black or
ti,am335x-bone in their compatible lists without including the
corresponding bone-black-common or bone-common device tree files.
Remove these incompatible strings to fix the inconsistency.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---

Change in v2:
- New patch
---
 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-osd3358-sm-red.dts     | 2 +-
 arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts       | 2 +-
 arch/arm/boot/dts/ti/omap/am335x-shc.dts                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Comments

Andreas Kemnade June 9, 2025, 8:08 p.m. UTC | #1
Am Mon, 09 Jun 2025 17:43:51 +0200
schrieb Kory Maincent <kory.maincent@bootlin.com>:

> Several device trees incorrectly included ti,am335x-bone-black or
> ti,am335x-bone in their compatible lists without including the
> corresponding bone-black-common or bone-common device tree files.
> Remove these incompatible strings to fix the inconsistency.
> 
thanks for cleaning up some mess.

> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> 
> Change in v2:
> - New patch
> ---
>  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-osd3358-sm-red.dts     | 2 +-
>  arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts       | 2 +-
>  arch/arm/boot/dts/ti/omap/am335x-shc.dts                | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> 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..fb88eebb8c5d 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 = "ti,am335x-bone-green-wireless", "ti,am335x-bone", "ti,am33xx";
>  
this looks like too much cleanup, also according your omap.yaml stuff,
ti,am335x-bone-green should still be included.

Regards,
Andreas
Kory Maincent June 9, 2025, 8:35 p.m. UTC | #2
Le Mon, 9 Jun 2025 22:08:09 +0200,
Andreas Kemnade <andreas@kemnade.info> a écrit :

> Am Mon, 09 Jun 2025 17:43:51 +0200
> schrieb Kory Maincent <kory.maincent@bootlin.com>:
> 
> > Several device trees incorrectly included ti,am335x-bone-black or
> > ti,am335x-bone in their compatible lists without including the
> > corresponding bone-black-common or bone-common device tree files.
> > Remove these incompatible strings to fix the inconsistency.
> >   
> thanks for cleaning up some mess.
> 
> > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> > ---
> > 
> > Change in v2:
> > - New patch
> > ---
> >  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-osd3358-sm-red.dts     | 2 +-
> >  arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts       | 2 +-
> >  arch/arm/boot/dts/ti/omap/am335x-shc.dts                | 2 +-
> >  5 files changed, 5 insertions(+), 5 deletions(-)
> > 
> > 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..fb88eebb8c5d 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 = "ti,am335x-bone-green-wireless", "ti,am335x-bone",
> > "ti,am33xx"; 
> this looks like too much cleanup, also according your omap.yaml stuff,
> ti,am335x-bone-green should still be included.

Oh indeed! Thanks.
diff mbox series

Patch

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..fb88eebb8c5d 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 = "ti,am335x-bone-green-wireless", "ti,am335x-bone", "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..022ecc971476 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 = "ti,am335x-bone-green", "ti,am335x-bone", "ti,am33xx";
 };
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..0c8a120a1811 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 = "ti,am335x-pocketbeagle", "ti,am33xx";
 
 	chosen {
 		stdout-path = &uart0;
diff --git a/arch/arm/boot/dts/ti/omap/am335x-shc.dts b/arch/arm/boot/dts/ti/omap/am335x-shc.dts
index 597482822608..f2393ff3f4d7 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 = "ti,am335x-shc", "ti,am33xx";
 
 	aliases {
 		mmcblk0 = &mmc1;