Re: [PATCH v4 2/7] arm: dts: omap: Remove incorrect compatible strings from device trees
From: Kevin Hilman <khilman@baylibre.com>
Date: 2025-06-18 20:41:20
Also in:
linux-devicetree, linux-omap, lkml
Kory Maincent [off-list ref] writes:
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>
While I agree with adding the new compatibles for clarity, I question removing the old ones after so much time in the kernel. As mentioned in earlier reviews, there is other tooling outside the kernel that has been built around these strings. The one that I have in mind is KernelCI based tooling that tracks boards based on compatible strings. While the KernelCI tooling does evolve with these kinds of kernel changes, it also still builds and tests older kernels. So if we want these tools to know that "beagle,am335x-bone" on a new kernel and "ti,am335x-bone" on an older stable kernel are actually the same board, the tools will need to keep track of that mapping as these change. So instead of removing them, can't we just make the new ones higher prio than the old ones? That way the tools can see both, and also see which one is higher prio. I fully realize this is not necessarily the best technical argument to keeping the old and wrong names, so I will defer to DT maintainers on this one. But since it's been wrong for a long time, I'm a bit reluctant to remove them completely knowing there will be external tools breakage. Kevin
quoted hunk ↗ jump to hunk
--- 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