| Message ID | 20250613-bbg-v3-2-514cdc768448@bootlin.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for BeagleBone Green Eco board | expand |
Le Fri, 13 Jun 2025 13:52:23 -0500, Jason Kridner <jkridner@gmail.com> a écrit : > On Fri, Jun 13, 2025 at 10:49 AM Kory Maincent <kory.maincent@bootlin.com> > wrote: > > > 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 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 | 4 ++-- > > arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts | 4 ++-- > > arch/arm/boot/dts/ti/omap/am335x-boneblack.dts | 4 ++-- > > arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 4 ++-- > > arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts | 4 ++-- > > arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts | 4 ++-- > > 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 | 4 ++-- > > 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, 22 insertions(+), 29 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..2790c0c5a473 100644 > > --- a/arch/arm/boot/dts/ti/omap/am335x-bone.dts > > +++ b/arch/arm/boot/dts/ti/omap/am335x-bone.dts > > @@ -8,8 +8,8 @@ > > #include "am335x-bone-common.dtsi" > > > > / { > > - model = "TI AM335x BeagleBone"; > > - compatible = "ti,am335x-bone", "ti,am33xx"; > > + model = "AM335x BeagleBone"; > > > We have software that looks at these in running systems, so I’d be ok not > to change. If changing, why not “BeagleBoard.org BeagleBone”? Not sure of > the convention to mention the SoC, but AM335x is not part of the product > name. Is it ok to change it or not then? Ok to move on to BeagleBoard.org. Regards,
Hi Kory, Am 16.06.25 um 11:39 schrieb Kory Maincent: > Le Fri, 13 Jun 2025 13:52:23 -0500, > Jason Kridner <jkridner@gmail.com> a écrit : > >> On Fri, Jun 13, 2025 at 10:49 AM Kory Maincent <kory.maincent@bootlin.com> >> wrote: >> >>> 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 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 | 4 ++-- >>> arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts | 4 ++-- >>> arch/arm/boot/dts/ti/omap/am335x-boneblack.dts | 4 ++-- >>> arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 4 ++-- >>> arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts | 4 ++-- >>> arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts | 4 ++-- >>> 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 | 4 ++-- >>> 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, 22 insertions(+), 29 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..2790c0c5a473 100644 >>> --- a/arch/arm/boot/dts/ti/omap/am335x-bone.dts >>> +++ b/arch/arm/boot/dts/ti/omap/am335x-bone.dts >>> @@ -8,8 +8,8 @@ >>> #include "am335x-bone-common.dtsi" >>> >>> / { >>> - model = "TI AM335x BeagleBone"; >>> - compatible = "ti,am335x-bone", "ti,am33xx"; >>> + model = "AM335x BeagleBone"; >> >> We have software that looks at these in running systems, so I’d be ok not >> to change. If changing, why not “BeagleBoard.org BeagleBone”? Not sure of >> the convention to mention the SoC, but AM335x is not part of the product >> name. > Is it ok to change it or not then? Ok to move on to BeagleBoard.org. The Debian project most notably uses the "model" string: https://salsa.debian.org/installer-team/flash-kernel/-/blob/master/db/all.db?ref_type=heads#L2191 When that changes inside a dtb by kernel update, users may be unable to boot. Therefore I would recommend against changing "model" values. sincerely Josua Mayer
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..2790c0c5a473 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-bone.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-bone.dts @@ -8,8 +8,8 @@ #include "am335x-bone-common.dtsi" / { - model = "TI AM335x BeagleBone"; - compatible = "ti,am335x-bone", "ti,am33xx"; + model = "AM335x BeagleBone"; + 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..d78b6427b8f2 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts @@ -11,8 +11,8 @@ #include <dt-bindings/interrupt-controller/irq.h> / { - model = "TI AM335x BeagleBone Black Wireless"; - compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; + model = "AM335x BeagleBone Black Wireless"; + 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..70c26d090ecb 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts @@ -10,8 +10,8 @@ #include "am335x-boneblack-hdmi.dtsi" / { - model = "TI AM335x BeagleBone Black"; - compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; + model = "AM335x BeagleBone Black"; + 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..779e74218b57 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts @@ -9,8 +9,8 @@ #include <dt-bindings/interrupt-controller/irq.h> / { - model = "TI AM335x BeagleBone Blue"; - compatible = "ti,am335x-bone-blue", "ti,am33xx"; + model = "AM335x BeagleBone Blue"; + 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..ee92abf43175 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts @@ -10,8 +10,8 @@ #include <dt-bindings/interrupt-controller/irq.h> / { - 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"; + model = "Seeed AM335x BeagleBone Green Wireless"; + 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..3d771721dcb8 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts @@ -9,6 +9,6 @@ #include "am335x-bonegreen-common.dtsi" / { - model = "TI AM335x BeagleBone Green"; - compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; + model = "Seeed AM335x BeagleBone Green"; + 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..c2f26687790c 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts @@ -11,8 +11,8 @@ #include <dt-bindings/leds/common.h> / { - model = "TI AM335x PocketBeagle"; - compatible = "ti,am335x-pocketbeagle", "ti,am335x-bone", "ti,am33xx"; + model = "AM335x PocketBeagle"; + 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..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;
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 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 | 4 ++-- arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts | 4 ++-- arch/arm/boot/dts/ti/omap/am335x-boneblack.dts | 4 ++-- arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 4 ++-- arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts | 4 ++-- arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts | 4 ++-- 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 | 4 ++-- 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, 22 insertions(+), 29 deletions(-)