Skip to contentSkip to conversation

arm: dts: linksys: rename codename to model

PATCH In review Paul Spooren 4 participants 13 messages Apr 7, 2020 – Apr 10, 2020 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover arm: dts: linksys: rename codename to model

Linksys chose to use codenames for a few of their devices and sell their them under an entirely different name.

codename model name

rango  -> wrt3200acm
mamba  -> wrt1900ac
cobra  -> wrt1900ac-v2

caiman -> wrt1200ac
shelby -> wrt1900acs

This introduces some extra loops in OpenWrt, a distribution specialized on embedded Internet facing devices, as both codename and model name are used within the build system. The double naming requires developers to keep track of that mapping and introduces inconsistencies:

To build a specific device in OpenWrt profiles are used, named after the the compatible string for targets using device tree (similar to how .dts files are named in the linux source tree). However, the first item of the DT compatible list in this case is linksys,rango, which is inconsistent with the model name and not what common users would expect.

Such double naming complicates currently the automatic search for firmware upgrade as the build system does not support such mapping. Ideally the first item of the DT compatible list would contain a string suitable to be used as a filename recognizable by normal users to belong to that device.

With this patch set the Linksys device tree files are moved from containing the codename to contain a sanitized model name and also use it as first entry of the DT compatible list.

Paul Spooren (5):
arm: dts: linksys: rename rango to wrt3200acm
arm: dts: linksys: rename mamba to wrt1900ac
arm: dts: linksys: rename cobra to wrt1900ac-v2
arm: dts: linksys: rename caiman to wrt1200ac
arm: dts: linksys: rename shelby to wrt1900acs

 arch/arm/boot/dts/Makefile                    | 10 +++----
 ...n.dts => armada-385-linksys-wrt1200ac.dts} | 26 +++++++++---------
 ...ts => armada-385-linksys-wrt1900ac-v2.dts} | 27 ++++++++++---------
 ....dts => armada-385-linksys-wrt1900acs.dts} | 25 ++++++++---------
 ....dts => armada-385-linksys-wrt3200acm.dts} | 26 +++++++++---------
 ...ba.dts => armada-xp-linksys-wrt1900ac.dts} | 27 ++++++++++---------
 6 files changed, 72 insertions(+), 69 deletions(-)
 rename arch/arm/boot/dts/{armada-385-linksys-caiman.dts => armada-385-linksys-wrt1200ac.dts} (80%)
 rename arch/arm/boot/dts/{armada-385-linksys-cobra.dts => armada-385-linksys-wrt1900ac-v2.dts} (78%)
 rename arch/arm/boot/dts/{armada-385-linksys-shelby.dts => armada-385-linksys-wrt1900acs.dts} (80%)
 rename arch/arm/boot/dts/{armada-385-linksys-rango.dts => armada-385-linksys-wrt3200acm.dts} (83%)
 rename arch/arm/boot/dts/{armada-xp-linksys-mamba.dts => armada-xp-linksys-wrt1900ac.dts} (92%)

base-commit: 7e63420847ae5f1036e4f7c42f0b3282e73efbc2

Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/5 arm: dts: linksys: rename rango to wrt3200acm

Linksys uses internally the codename "rango" for a device sold under the name of "Linksys WRT3200ACM", which is already reflected in the device tree model. However the compatible list only contains the codename linksys,rango which does not relate to the common name.

This patch renames the dts file to the sanitized model name and prepends linksys,wrt3200acm to the compatible list to simplify the device relation.

CC Rob Herring <[email protected]>
CC Jason Cooper <[email protected]>
CC Andrew Lunn <[email protected]>
CC Gregory Clement <[email protected]>
CC Sebastian Hesselbarth <[email protected]>
CC Daniel Golle <[email protected]>
CC Adrian Schmutzler <[email protected]>
---
 arch/arm/boot/dts/Makefile                    |  2 +-
 ....dts => armada-385-linksys-wrt3200acm.dts} | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename arch/arm/boot/dts/{armada-385-linksys-rango.dts => armada-385-linksys-wrt3200acm.dts} (83%)
arch/arm/boot/dts/Makefile +1 -1
index e8dd99201397..a0df7f97cc44 100644
@@ -1282,8 +1282,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
 	armada-385-db-ap.dtb \
 	armada-385-linksys-caiman.dtb \
 	armada-385-linksys-cobra.dtb \
-	armada-385-linksys-rango.dtb \
 	armada-385-linksys-shelby.dtb \
+	armada-385-linksys-wrt3200acm.dtb \
 	armada-385-synology-ds116.dtb \
 	armada-385-turris-omnia.dtb \
 	armada-388-clearfog.dtb \
arch/arm/boot/dts/armada-385-linksys-wrt3200acm.dts renamed from arch/arm/boot/dts/armada-385-linksys-rango.dts +13 -13
similarity index 83%
rename from arch/arm/boot/dts/armada-385-linksys-rango.dts
rename to arch/arm/boot/dts/armada-385-linksys-wrt3200acm.dts
index 3c4af57ec2b9..bf7b546e3344 100644
@@ -12,43 +12,43 @@
 
 / {
 	model = "Linksys WRT3200ACM";
-	compatible = "linksys,rango", "linksys,armada385", "marvell,armada385",
-		     "marvell,armada380";
+	compatible = "linksys,wrt3200acm", "linksys,rango", "linksys,armada385",
+		     "marvell,armada385", "marvell,armada380";
 };
 
 &expander0 {
 	wan_amber@0 {
-		label = "rango:amber:wan";
+		label = "wrt3200acm:amber:wan";
 		reg = <0x0>;
 	};
 
 	wan_white@1 {
-		label = "rango:white:wan";
+		label = "wrt3200acm:white:wan";
 		reg = <0x1>;
 	};
 
 	usb2@5 {
-		label = "rango:white:usb2";
+		label = "wrt3200acm:white:usb2";
 		reg = <0x5>;
 	};
 
 	usb3_1@6 {
-		label = "rango:white:usb3_1";
+		label = "wrt3200acm:white:usb3_1";
 		reg = <0x6>;
 	};
 
 	usb3_2@7 {
-		label = "rango:white:usb3_2";
+		label = "wrt3200acm:white:usb3_2";
 		reg = <0x7>;
 	};
 
 	wps_white@8 {
-		label = "rango:white:wps";
+		label = "wrt3200acm:white:wps";
 		reg = <0x8>;
 	};
 
 	wps_amber@9 {
-		label = "rango:amber:wps";
+		label = "wrt3200acm:amber:wps";
 		reg = <0x9>;
 	};
 };
@@ -56,22 +56,22 @@ wps_amber@9 {
 &gpio_leds {
 	power {
 		gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
-		label = "rango:white:power";
+		label = "wrt3200acm:white:power";
 	};
 
 	sata {
 		gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-		label = "rango:white:sata";
+		label = "wrt3200acm:white:sata";
 	};
 
 	wlan_2g {
 		gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
-		label = "rango:white:wlan_2g";
+		label = "wrt3200acm:white:wlan_2g";
 	};
 
 	wlan_5g {
 		gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
-		label = "rango:white:wlan_5g";
+		label = "wrt3200acm:white:wlan_5g";
 	};
 };
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/5 arm: dts: linksys: rename mamba to wrt1900ac

In reply to Paul Spooren

Linksys uses internally the codename "mamba" for a device sold under the name of "Linksys WRT1900AC", which is already reflected in the device tree model. However the compatible list only contains the codename linksys,mamba which does not relate to the common name.

This patch renames the dts file to the sanitized model name and prepends linksys,wrt1900ac to the compatible list to simplify the device relation.

CC Rob Herring <[email protected]>
CC Jason Cooper <[email protected]>
CC Andrew Lunn <[email protected]>
CC Gregory Clement <[email protected]>
CC Sebastian Hesselbarth <[email protected]>
CC Daniel Golle <[email protected]>
CC Adrian Schmutzler <[email protected]>
---
 arch/arm/boot/dts/Makefile                    |  2 +-
 ...ba.dts => armada-xp-linksys-wrt1900ac.dts} | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)
 rename arch/arm/boot/dts/{armada-xp-linksys-mamba.dts => armada-xp-linksys-wrt1900ac.dts} (92%)
arch/arm/boot/dts/Makefile +1 -1
index a0df7f97cc44..cf288adb8fe0 100644
@@ -1302,7 +1302,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
 	armada-xp-db-xc3-24g4xg.dtb \
 	armada-xp-gp.dtb \
 	armada-xp-lenovo-ix4-300d.dtb \
-	armada-xp-linksys-mamba.dtb \
+	armada-xp-linksys-wrt1900ac.dtb \
 	armada-xp-matrix.dtb \
 	armada-xp-netgear-rn2120.dtb \
 	armada-xp-openblocks-ax3-4.dtb \
arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts renamed from arch/arm/boot/dts/armada-xp-linksys-mamba.dts +14 -13
similarity index 92%
rename from arch/arm/boot/dts/armada-xp-linksys-mamba.dts
rename to arch/arm/boot/dts/armada-xp-linksys-wrt1900ac.dts
index 8480a16919a0..2644870fec2c 100644
@@ -23,8 +23,9 @@
 
 / {
 	model = "Linksys WRT1900AC";
-	compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
-		     "marvell,armadaxp", "marvell,armada-370-xp";
+	compatible = "linksys,wrt1900ac", "linksys,mamba",
+		     "marvell,armadaxp-mv78230", "marvell,armadaxp",
+		     "marvell,armada-370-xp";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
@@ -110,53 +111,53 @@ tlc59116@68 {
 					reg = <0x68>;
 
 					wan_amber@0 {
-						label = "mamba:amber:wan";
+						label = "wrt1900ac:amber:wan";
 						reg = <0x0>;
 					};
 
 					wan_white@1 {
-						label = "mamba:white:wan";
+						label = "wrt1900ac:white:wan";
 						reg = <0x1>;
 					};
 
 					wlan_2g@2 {
-						label = "mamba:white:wlan_2g";
+						label = "wrt1900ac:white:wlan_2g";
 						reg = <0x2>;
 					};
 
 					wlan_5g@3 {
-						label = "mamba:white:wlan_5g";
+						label = "wrt1900ac:white:wlan_5g";
 						reg = <0x3>;
 					};
 
 					esata@4 {
-						label = "mamba:white:esata";
+						label = "wrt1900ac:white:esata";
 						reg = <0x4>;
 						linux,default-trigger = "disk-activity";
 					};
 
 					usb2@5 {
-						label = "mamba:white:usb2";
+						label = "wrt1900ac:white:usb2";
 						reg = <0x5>;
 					};
 
 					usb3_1@6 {
-						label = "mamba:white:usb3_1";
+						label = "wrt1900ac:white:usb3_1";
 						reg = <0x6>;
 					};
 
 					usb3_2@7 {
-						label = "mamba:white:usb3_2";
+						label = "wrt1900ac:white:usb3_2";
 						reg = <0x7>;
 					};
 
 					wps_white@8 {
-						label = "mamba:white:wps";
+						label = "wrt1900ac:white:wps";
 						reg = <0x8>;
 					};
 
 					wps_amber@9 {
-						label = "mamba:amber:wps";
+						label = "wrt1900ac:amber:wps";
 						reg = <0x9>;
 					};
 				};
@@ -198,7 +199,7 @@ gpio-leds {
 		pinctrl-names = "default";
 
 		power {
-			label = "mamba:white:power";
+			label = "wrt1900ac:white:power";
 			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/5 arm: dts: linksys: rename cobra to wrt1900ac-v2

In reply to Paul Spooren

Linksys uses internally the codename "cobra" for a device sold under the name of "Linksys WRT1900ACv2", which is already reflected in the device tree model. However the compatible list only contains the codename linksys,cobra which does not relate to the common name.

This patch renames the dts file to the sanitized model name and prepends linksys,wrt1900ac-v2 to the compatible list to simplify the device relation.

For consistency with other models containing a version number a space was added in the DT model to sepparate the *v2* and also reflected in the dts filename containing -v2.

CC Rob Herring <[email protected]>
CC Jason Cooper <[email protected]>
CC Andrew Lunn <[email protected]>
CC Gregory Clement <[email protected]>
CC Sebastian Hesselbarth <[email protected]>
CC Daniel Golle <[email protected]>
CC Adrian Schmutzler <[email protected]>
---
 arch/arm/boot/dts/Makefile                    |  2 +-
 ...ts => armada-385-linksys-wrt1900ac-v2.dts} | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)
 rename arch/arm/boot/dts/{armada-385-linksys-cobra.dts => armada-385-linksys-wrt1900ac-v2.dts} (78%)
arch/arm/boot/dts/Makefile +1 -1
index cf288adb8fe0..be45b5fb4f95 100644
@@ -1281,8 +1281,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
 	armada-385-db-88f6820-amc.dtb \
 	armada-385-db-ap.dtb \
 	armada-385-linksys-caiman.dtb \
-	armada-385-linksys-cobra.dtb \
 	armada-385-linksys-shelby.dtb \
+	armada-385-linksys-wrt1900ac-v2.dtb \
 	armada-385-linksys-wrt3200acm.dtb \
 	armada-385-synology-ds116.dtb \
 	armada-385-turris-omnia.dtb \
arch/arm/boot/dts/armada-385-linksys-wrt1900ac-v2.dts renamed from arch/arm/boot/dts/armada-385-linksys-cobra.dts +14 -13
similarity index 78%
rename from arch/arm/boot/dts/armada-385-linksys-cobra.dts
rename to arch/arm/boot/dts/armada-385-linksys-wrt1900ac-v2.dts
index e3e4877a6f49..8f78350fa988 100644
@@ -9,65 +9,66 @@
 #include "armada-385-linksys.dtsi"
 
 / {
-	model = "Linksys WRT1900ACv2";
-	compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",
+	model = "Linksys WRT1900AC v2";
+	compatible = "linksys,wrt1900ac-v2", "linksys,cobra",
+		     "linksys,armada385", "marvell,armada385",
 		     "marvell,armada380";
 };
 
 &expander0 {
 	wan_amber@0 {
-		label = "cobra:amber:wan";
+		label = "wrt1900ac-v2:amber:wan";
 		reg = <0x0>;
 	};
 
 	wan_white@1 {
-		label = "cobra:white:wan";
+		label = "wrt1900ac-v2:white:wan";
 		reg = <0x1>;
 	};
 
 	wlan_2g@2 {
-		label = "cobra:white:wlan_2g";
+		label = "wrt1900ac-v2:white:wlan_2g";
 		reg = <0x2>;
 	};
 
 	wlan_5g@3 {
-		label = "cobra:white:wlan_5g";
+		label = "wrt1900ac-v2:white:wlan_5g";
 		reg = <0x3>;
 	};
 
 	usb2@5 {
-		label = "cobra:white:usb2";
+		label = "wrt1900ac-v2:white:usb2";
 		reg = <0x5>;
 	};
 
 	usb3_1@6 {
-		label = "cobra:white:usb3_1";
+		label = "wrt1900ac-v2:white:usb3_1";
 		reg = <0x6>;
 	};
 
 	usb3_2@7 {
-		label = "cobra:white:usb3_2";
+		label = "wrt1900ac-v2:white:usb3_2";
 		reg = <0x7>;
 	};
 
 	wps_white@8 {
-		label = "cobra:white:wps";
+		label = "wrt1900ac-v2:white:wps";
 		reg = <0x8>;
 	};
 
 	wps_amber@9 {
-		label = "cobra:amber:wps";
+		label = "wrt1900ac-v2:amber:wps";
 		reg = <0x9>;
 	};
 };
 
 &gpio_leds {
 	power {
-		label = "cobra:white:power";
+		label = "wrt1900ac-v2:white:power";
 	};
 
 	sata {
-		label = "cobra:white:sata";
+		label = "wrt1900ac-v2:white:sata";
 	};
 };
 
Signature · 1 line
2.25.1
#4 lore raw

PATCH 4/5 arm: dts: linksys: rename caiman to wrt1200ac

In reply to Paul Spooren

Linksys uses internally the codename "caiman" for a device sold under the name of "Linksys WRT1200AC", which is already reflected in the device tree model. However the compatible list only contains the codename linksys,caiman which does not relate to the common name.

This patch renames the dts file to the sanitized model name and prepends linksys,wrt1200ac to the compatible list to simplify the device relation.

CC Rob Herring <[email protected]>
CC Jason Cooper <[email protected]>
CC Andrew Lunn <[email protected]>
CC Gregory Clement <[email protected]>
CC Sebastian Hesselbarth <[email protected]>
CC Daniel Golle <[email protected]>
CC Adrian Schmutzler <[email protected]>
---
 arch/arm/boot/dts/Makefile                    |  2 +-
 ...n.dts => armada-385-linksys-wrt1200ac.dts} | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename arch/arm/boot/dts/{armada-385-linksys-caiman.dts => armada-385-linksys-wrt1200ac.dts} (80%)
arch/arm/boot/dts/Makefile +1 -1
index be45b5fb4f95..8482bec35af4 100644
@@ -1280,8 +1280,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
 	armada-385-clearfog-gtr-l8.dtb \
 	armada-385-db-88f6820-amc.dtb \
 	armada-385-db-ap.dtb \
-	armada-385-linksys-caiman.dtb \
 	armada-385-linksys-shelby.dtb \
+	armada-385-linksys-wrt1200ac.dtb \
 	armada-385-linksys-wrt1900ac-v2.dtb \
 	armada-385-linksys-wrt3200acm.dtb \
 	armada-385-synology-ds116.dtb \
arch/arm/boot/dts/armada-385-linksys-wrt1200ac.dts renamed from arch/arm/boot/dts/armada-385-linksys-caiman.dts +13 -13
similarity index 80%
rename from arch/arm/boot/dts/armada-385-linksys-caiman.dts
rename to arch/arm/boot/dts/armada-385-linksys-wrt1200ac.dts
index a03050c97084..acc8338987f5 100644
@@ -10,64 +10,64 @@
 
 / {
 	model = "Linksys WRT1200AC";
-	compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",
-		     "marvell,armada380";
+	compatible = "linksys,wrt1200ac", "linksys,caiman", "linksys,armada385",
+		     "marvell,armada385", "marvell,armada380";
 };
 
 &expander0 {
 	wan_amber@0 {
-		label = "caiman:amber:wan";
+		label = "wrt1200ac:amber:wan";
 		reg = <0x0>;
 	};
 
 	wan_white@1 {
-		label = "caiman:white:wan";
+		label = "wrt1200ac:white:wan";
 		reg = <0x1>;
 	};
 
 	wlan_2g@2 {
-		label = "caiman:white:wlan_2g";
+		label = "wrt1200ac:white:wlan_2g";
 		reg = <0x2>;
 	};
 
 	wlan_5g@3 {
-		label = "caiman:white:wlan_5g";
+		label = "wrt1200ac:white:wlan_5g";
 		reg = <0x3>;
 	};
 
 	usb2@5 {
-		label = "caiman:white:usb2";
+		label = "wrt1200ac:white:usb2";
 		reg = <0x5>;
 	};
 
 	usb3_1@6 {
-		label = "caiman:white:usb3_1";
+		label = "wrt1200ac:white:usb3_1";
 		reg = <0x6>;
 	};
 
 	usb3_2@7 {
-		label = "caiman:white:usb3_2";
+		label = "wrt1200ac:white:usb3_2";
 		reg = <0x7>;
 	};
 
 	wps_white@8 {
-		label = "caiman:white:wps";
+		label = "wrt1200ac:white:wps";
 		reg = <0x8>;
 	};
 
 	wps_amber@9 {
-		label = "caiman:amber:wps";
+		label = "wrt1200ac:amber:wps";
 		reg = <0x9>;
 	};
 };
 
 &gpio_leds {
 	power {
-		label = "caiman:white:power";
+		label = "wrt1200ac:white:power";
 	};
 
 	sata {
-		label = "caiman:white:sata";
+		label = "wrt1200ac:white:sata";
 	};
 };
 
Signature · 1 line
2.25.1
#5 lore raw

PATCH 5/5 arm: dts: linksys: rename shelby to wrt1900acs

In reply to Paul Spooren

Linksys uses internally the codename "shelby" for a device sold under the name of "Linksys WRT1900ACS", which is already reflected in the device tree model. However the compatible list only contains the codename linksys,shelby which does not relate to the common name.

This patch renames the dts file to the sanitized model name and prepends linksys,wrt1900acs to the compatible list to simplify the device relation.

CC Rob Herring <[email protected]>
CC Jason Cooper <[email protected]>
CC Andrew Lunn <[email protected]>
CC Gregory Clement <[email protected]>
CC Sebastian Hesselbarth <[email protected]>
CC Daniel Golle <[email protected]>
CC Adrian Schmutzler <[email protected]>
---
 arch/arm/boot/dts/Makefile                    |  2 +-
 ....dts => armada-385-linksys-wrt1900acs.dts} | 25 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)
 rename arch/arm/boot/dts/{armada-385-linksys-shelby.dts => armada-385-linksys-wrt1900acs.dts} (80%)
arch/arm/boot/dts/Makefile +1 -1
index 8482bec35af4..f59bcb23db91 100644
@@ -1280,9 +1280,9 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
 	armada-385-clearfog-gtr-l8.dtb \
 	armada-385-db-88f6820-amc.dtb \
 	armada-385-db-ap.dtb \
-	armada-385-linksys-shelby.dtb \
 	armada-385-linksys-wrt1200ac.dtb \
 	armada-385-linksys-wrt1900ac-v2.dtb \
+	armada-385-linksys-wrt1900acs.dtb \
 	armada-385-linksys-wrt3200acm.dtb \
 	armada-385-synology-ds116.dtb \
 	armada-385-turris-omnia.dtb \
arch/arm/boot/dts/armada-385-linksys-wrt1900acs.dts renamed from arch/arm/boot/dts/armada-385-linksys-shelby.dts +13 -12
similarity index 80%
rename from arch/arm/boot/dts/armada-385-linksys-shelby.dts
rename to arch/arm/boot/dts/armada-385-linksys-wrt1900acs.dts
index 3451cd3e5dff..866f3fad19fa 100644
@@ -10,64 +10,65 @@
 
 / {
 	model = "Linksys WRT1900ACS";
-	compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385",
+	compatible = "linksys,wrt1900acs", "linksys,shelby",
+		     "linksys,armada385", "marvell,armada385",
 		     "marvell,armada380";
 };
 
 &expander0 {
 	wan_amber@0 {
-		label = "shelby:amber:wan";
+		label = "wrt1900acs:amber:wan";
 		reg = <0x0>;
 	};
 
 	wan_white@1 {
-		label = "shelby:white:wan";
+		label = "wrt1900acs:white:wan";
 		reg = <0x1>;
 	};
 
 	wlan_2g@2 {
-		label = "shelby:white:wlan_2g";
+		label = "wrt1900acs:white:wlan_2g";
 		reg = <0x2>;
 	};
 
 	wlan_5g@3 {
-		label = "shelby:white:wlan_5g";
+		label = "wrt1900acs:white:wlan_5g";
 		reg = <0x3>;
 	};
 
 	usb2@5 {
-		label = "shelby:white:usb2";
+		label = "wrt1900acs:white:usb2";
 		reg = <0x5>;
 	};
 
 	usb3_1@6 {
-		label = "shelby:white:usb3_1";
+		label = "wrt1900acs:white:usb3_1";
 		reg = <0x6>;
 	};
 
 	usb3_2@7 {
-		label = "shelby:white:usb3_2";
+		label = "wrt1900acs:white:usb3_2";
 		reg = <0x7>;
 	};
 
 	wps_white@8 {
-		label = "shelby:white:wps";
+		label = "wrt1900acs:white:wps";
 		reg = <0x8>;
 	};
 
 	wps_amber@9 {
-		label = "shelby:amber:wps";
+		label = "wrt1900acs:amber:wps";
 		reg = <0x9>;
 	};
 };
 
 &gpio_leds {
 	power {
-		label = "shelby:white:power";
+		label = "wrt1900acs:white:power";
 	};
 
 	sata {
-		label = "shelby:white:sata";
+		label = "wrt1900acs:white:sata";
 	};
 };
 
Signature · 1 line
2.25.1
#6 lore raw

cover arm: dts: linksys: rename codename to model

In reply to Paul Spooren

Linksys chose to use codenames for a few of their devices and sell their them under an entirely different name.

codename model name

rango  -> wrt3200acm
mamba  -> wrt1900ac
cobra  -> wrt1900ac-v2

caiman -> wrt1200ac
shelby -> wrt1900acs

This introduces some extra loops in OpenWrt, a distribution specialized on embedded Internet facing devices, as both codename and model name are used within the build system. The double naming requires developers to keep track of that mapping and introduces inconsistencies:

To build a specific device in OpenWrt profiles are used, named after the device model, e.g. wrt3200acm. However as device tree is used and the first item of the DT compatible list is linksys,rango, the running device identifies itself as linksys,rango.

Such double naming complicates currently the automatic search for firmware upgrade as the build system does not support such mapping. Ideally the first item of the DT compatible list would contain a string reasonable similar to the DT model.

With this patch set the Linksys device tree files are moved from containing the codename to contain a sanitized model name and also use it as first entry of the DT compatible list.

Paul Spooren (5):
arm: dts: linksys: rename rango to wrt3200acm
arm: dts: linksys: rename mamba to wrt1900ac
arm: dts: linksys: rename cobra to wrt1900acv2
arm: dts: linksys: rename caiman to wrt1200ac
arm: dts: linksys: rename shelby to wrt1900acsv

#7 lore raw
In reply to Paul Spooren
Quoted 9 lines · Paul Spooren

Linksys chose to use codenames for a few of their devices and sell their them under an entirely different name.

codename model name

rango  -> wrt3200acm
mamba  -> wrt1900ac
cobra  -> wrt1900ac-v2

caiman -> wrt1200ac
shelby -> wrt1900acs

Hi Paul

There was quite a bit of discussion about this when the first board was added. If i remember correctly, it was Mamba.

Imre Kaloz, <[email protected]> was the one arguing for the name armada-xp-linksys-mamba.dts.

So it seems that openwrt.org has now come full circle?

Quoted 17 lines

This introduces some extra loops in OpenWrt, a distribution specialized on embedded Internet facing devices, as both codename and model name are used within the build system. The double naming requires developers to keep track of that mapping and introduces inconsistencies:

To build a specific device in OpenWrt profiles are used, named after the the compatible string for targets using device tree (similar to how .dts files are named in the linux source tree). However, the first item of the DT compatible list in this case is linksys,rango, which is inconsistent with the model name and not what common users would expect.

Such double naming complicates currently the automatic search for firmware upgrade as the build system does not support such mapping. Ideally the first item of the DT compatible list would contain a string suitable to be used as a filename recognizable by normal users to belong to that device.

Quoted 3 lines

With this patch set the Linksys device tree files are moved from containing the codename to contain a sanitized model name and also use it as first entry of the DT compatible list.

I've no problems adding another compatible to the list. But i don't like the idea of renaming the files. The file names could be considered ABI! What installers/bootloaders are you going to break by renaming them?

Andrew

#8 lore raw

Hi Andrew,

thank you very much for the quick response!

Quoted 14 lines · Andrew Lunn
Quoted 10 lines · Paul Spooren

Linksys chose to use codenames for a few of their devices and sell their
them under an entirely different name.

codename model name

rango  -> wrt3200acm
mamba  -> wrt1900ac
cobra  -> wrt1900ac-v2

caiman -> wrt1200ac
shelby -> wrt1900acs

Hi Paul

Quoted 7 lines

There was quite a bit of discussion about this when the first board was added. If i remember correctly, it was Mamba.

Imre Kaloz, <[email protected]> was the one arguing for the name armada-xp-linksys-mamba.dts.

So it seems that openwrt.org has now come full circle?

I talked with three currently active OpenWrt core developers and all were in favor of a unification. I wasn't aware of any previous discussions nor any pro arguments to keep code names.

I've added Imre via CC so maybe he can share his opinion, too.

Quoted 30 lines
Quoted 19 lines

This introduces some extra loops in OpenWrt, a distribution specialized
on embedded Internet facing devices, as both codename and model name are
used within the build system. The double naming requires developers to
keep track of that mapping and introduces inconsistencies:

To build a specific device in OpenWrt profiles are used, named after the
the compatible string for targets using device tree (similar to how .dts
files are named in the linux source tree). However, the first item of
the DT compatible list in this case is linksys,rango, which is inconsistent with the model name and not what common users would expect.

Quoted 10 lines

Such double naming complicates currently the automatic search for firmware upgrade as the build system does not support such mapping. Ideally the first item of the DT compatible list would contain a string suitable to be used as a filename recognizable by normal users to
belong to that device.
With this patch set the Linksys device tree files are moved from containing the codename to contain a sanitized model name and also use
it as first entry of the DT compatible list.

Quoted 4 lines

I've no problems adding another compatible to the list. But i don't like the idea of renaming the files. The file names could be considered ABI! What installers/bootloaders are you going to break by renaming them?

Are you okay with adding the new compatible string as first element of the list? This would already simplify the OpenWrt build system.

What about the changed labels? Are they considered ABI too?

Regarding file names, I'm new to ABI policies. Within OpenWrt this is all done via a single line patch, I'm not familiar with any other installers/bootloaders.

If renaming is a reason not to merge this I'd send a v2 containing only the the added compatible list and updated labels.

Best,
Paul

#9 lore raw
Quoted 62 lines · Paul Spooren

Hi Andrew,

thank you very much for the quick response!

Quoted 14 lines · Andrew Lunn
Quoted 10 lines · Paul Spooren

Linksys chose to use codenames for a few of their devices and sell their
them under an entirely different name.

codename model name

rango  -> wrt3200acm
mamba  -> wrt1900ac
cobra  -> wrt1900ac-v2

caiman -> wrt1200ac
shelby -> wrt1900acs

Hi Paul

Quoted 7 lines

There was quite a bit of discussion about this when the first board was added. If i remember correctly, it was Mamba.

Imre Kaloz, <[email protected]> was the one arguing for the name armada-xp-linksys-mamba.dts.

So it seems that openwrt.org has now come full circle?

I talked with three currently active OpenWrt core developers and all were in favor of a unification. I wasn't aware of any previous discussions nor any pro arguments to keep code names.

I've added Imre via CC so maybe he can share his opinion, too.

Quoted 30 lines
Quoted 29 lines

This introduces some extra loops in OpenWrt, a distribution specialized
on embedded Internet facing devices, as both codename and model name are
used within the build system. The double naming requires developers to
keep track of that mapping and introduces inconsistencies:

To build a specific device in OpenWrt profiles are used, named after the
the compatible string for targets using device tree (similar to how .dts
files are named in the linux source tree). However, the first item of
the DT compatible list in this case is linksys,rango, which is inconsistent with the model name and not what common users would expect.

Such double naming complicates currently the automatic search for firmware upgrade as the build system does not support such mapping. Ideally the first item of the DT compatible list would contain a string suitable to be used as a filename recognizable by normal users to
belong to that device.
With this patch set the Linksys device tree files are moved from containing the codename to contain a sanitized model name and also use
it as first entry of the DT compatible list.

Quoted 7 lines
Quoted 4 lines

I've no problems adding another compatible to the list. But i don't like the idea of renaming the files. The file names could be considered ABI! What installers/bootloaders are you going to break by renaming them?

Are you okay with adding the new compatible string as first element of the list? This would already simplify the OpenWrt build system.

Having a mapping table between model names in OpenWrt profiles and .dts file names in the kernel sources is not that complicated to maintain, changing the kernel for that reason sounds a bit weak IMHO.

Signature · 1 line
Florian

A message that is not in the archive (sent off-list or not yet received): VI1PR02MB5325621D39BF0FFAFE3993C4A0C00@VI1PR02MB5325.eurprd02.prod.outlook.com

#11 lore raw

Hi Imre,

Quoted 7 lines · Imre Kaloz

Hi,

I'm on the same page here - this has not an issue for years. The common sense and policy was always to reject kernel changes that would only make the userland's job easier - and here were are not even talking about the userland, but a script that's being used for image generation.

The reason codenames are preffered to marketing names is simple: the same board can be sold under multiple marketing names.

The Linksys Viper has been sold as E4200v2 and EA4500. The Linksys Focus as EA6100 and EA5800. The LeMans is the EA6300 and the EA6200. The Macan is both EA7500 and EA7400 - on the other hand, the EA7500v2 and the EA7400v2 are the Savannah.

What Paul, Adian and others are trying to achieve here is consistency. See also the debate on openwrt-devel:

http://lists.infradead.org/pipermail/openwrt-devel/2020-April/022567.html

The goal is to make it easier for users and semi-automated processes to identify the right OpenWrt image for a specific device. This especially becomes necessary for OTA updates and we have invested quite a bit of work to no longer need to scrape and translate that with additional layers of abstraction but simply use the first (ie. most significant) compatible from DTS to indentify the right image.

As product-name aliases are indeed very common, we usually deal with it in a way that the first product name which hits the OpenWrt tree is used for model, compatible, DTS- and image filenames. We then add aliases to that in our build-scripts which allows web-based wizards and such to match the alternative names as well when entered by the user.

Quoted 83 lines

Best,

Imre

________________________________
From: Florian Fainelli <[email protected]>
Sent: Wednesday, April 8, 2020 2:07:38 AM
To: Paul Spooren <[email protected]>; Andrew Lunn <[email protected]>
Cc: [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>
Subject: Re: [PATCH 0/5] arm: dts: linksys: rename codename to model

Quoted 67 lines · Paul Spooren

Hi Andrew,

thank you very much for the quick response!

Quoted 14 lines · Andrew Lunn
Quoted 10 lines · Paul Spooren

Linksys chose to use codenames for a few of their devices and sell their
them under an entirely different name.

codename model name

rango  -> wrt3200acm
mamba  -> wrt1900ac
cobra  -> wrt1900ac-v2

caiman -> wrt1200ac
shelby -> wrt1900acs

Hi Paul

Quoted 7 lines

There was quite a bit of discussion about this when the first board was added. If i remember correctly, it was Mamba.

Imre Kaloz, <[email protected]> was the one arguing for the name armada-xp-linksys-mamba.dts.

So it seems that openwrt.org has now come full circle?

I talked with three currently active OpenWrt core developers and all were in favor of a unification. I wasn't aware of any previous discussions nor any pro arguments to keep code names.

I've added Imre via CC so maybe he can share his opinion, too.

Quoted 34 lines
Quoted 19 lines

This introduces some extra loops in OpenWrt, a distribution specialized
on embedded Internet facing devices, as both codename and model name are
used within the build system. The double naming requires developers to
keep track of that mapping and introduces inconsistencies:

To build a specific device in OpenWrt profiles are used, named after the
the compatible string for targets using device tree (similar to how .dts
files are named in the linux source tree). However, the first item of
the DT compatible list in this case is linksys,rango, which is inconsistent with the model name and not what common users would expect.

Quoted 10 lines

Such double naming complicates currently the automatic search for firmware upgrade as the build system does not support such mapping. Ideally the first item of the DT compatible list would contain a string suitable to be used as a filename recognizable by normal users to
belong to that device.
With this patch set the Linksys device tree files are moved from containing the codename to contain a sanitized model name and also use
it as first entry of the DT compatible list.

I've no problems adding another compatible to the list. But i don't like the idea of renaming the files. The file names could be considered ABI! What installers/bootloaders are you going to break by renaming them?

Quoted 8 lines
Quoted 2 lines

Are you okay with adding the new compatible string as first element of the list? This would already simplify the OpenWrt build system.

Having a mapping table between model names in OpenWrt profiles and .dts file names in the kernel sources is not that complicated to maintain, changing the kernel for that reason sounds a bit weak IMHO. --
Florian

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#12 lore raw
Quoted 33 lines · Daniel Golle

Hi Imre,

Quoted 8 lines · Imre Kaloz

Hi,

I'm on the same page here - this has not an issue for years. The common sense and policy was always to reject kernel changes that would only make the userland's job easier - and here were are not even talking about the userland, but a script that's being used for image generation.

Quoted 7 lines

The reason codenames are preffered to marketing names is simple:
the same board can be sold under multiple marketing names.

The Linksys Viper has been sold as E4200v2 and EA4500. The Linksys Focus as EA6100 and EA5800. The LeMans is the EA6300 and the EA6200. The Macan is both EA7500 and EA7400 - on the other hand, the EA7500v2 and the EA7400v2 are the Savannah.

What Paul, Adian and others are trying to achieve here is consistency.
See also the debate on openwrt-devel:

http://lists.infradead.org/pipermail/openwrt-devel/2020-April/022567.html

The goal is to make it easier for users and semi-automated processes to identify the right OpenWrt image for a specific device. This especially becomes necessary for OTA updates and we have invested
quite a bit of work to no longer need to scrape and translate that with additional layers of abstraction but simply use the first (ie. most significant) compatible from DTS to indentify the right image.

Quoted 7 lines

As product-name aliases are indeed very common, we usually deal with it
in a way that the first product name which hits the OpenWrt tree is used for model, compatible, DTS- and image filenames. We then add aliases to that in our build-scripts which allows web-based wizards and
such to match the alternative names as well when entered by the user.

I think if renaming of the label names is out of the questions (for ABI stability), the situation becomes worse adding the OpenWrt profile-name as first item to the compatible list: The OpenWrt build system would use internally linksys_wrt3200acm while other scripts for LEDs would still use rango.

Therefore I'd suggest to reject the patch and I'll see if we apply them within OpenWrt only or come up with something entirely different.

Thanks everyone for your time, this first Kernel patch run was a bit exciting!

Stay safe & healthy,
Paul

Quoted 122 lines
Quoted 122 lines

Best,

Imre

________________________________
From: Florian Fainelli <[email protected]>
Sent: Wednesday, April 8, 2020 2:07:38 AM
To: Paul Spooren <[email protected]>; Andrew Lunn <[email protected]>
Cc: [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] < [email protected]>; [email protected] < [email protected]>; [email protected] <[email protected]>
Subject: Re: [PATCH 0/5] arm: dts: linksys: rename codename to model

Quoted 84 lines · Paul Spooren

Hi Andrew,

thank you very much for the quick response!

Quoted 15 lines · Andrew Lunn
Quoted 11 lines · Paul Spooren

Linksys chose to use codenames for a few of their devices and sell
their
them under an entirely different name.

codename model name

rango  -> wrt3200acm
mamba  -> wrt1900ac
cobra  -> wrt1900ac-v2

caiman -> wrt1200ac
shelby -> wrt1900acs

Hi Paul

Quoted 8 lines

There was quite a bit of discussion about this when the first board
was added. If i remember correctly, it was Mamba.

Imre Kaloz, <[email protected]> was the one arguing for the name armada-xp-linksys-mamba.dts.

So it seems that openwrt.org has now come full circle?

I talked with three currently active OpenWrt core developers and all
were in favor of a unification. I wasn't aware of any previous discussions nor any pro arguments to keep code names.

I've added Imre via CC so maybe he can share his opinion, too.

Quoted 42 lines
Quoted 25 lines

This introduces some extra loops in OpenWrt, a distribution specialized
on embedded Internet facing devices, as both codename and model
name are
used within the build system. The double naming requires developers
to
keep track of that mapping and introduces inconsistencies:

To build a specific device in OpenWrt profiles are used, named
after the
the compatible string for targets using device tree (similar to how
.dts
files are named in the linux source tree). However, the first item
of
the DT compatible list in this case is linksys,rango, which is
inconsistent with the model name and not what common users would
expect.

Quoted 16 lines

Such double naming complicates currently the automatic search for
firmware upgrade as the build system does not support such mapping.
Ideally the first item of the DT compatible list would contain a
string suitable to be used as a filename recognizable by normal
users to
belong to that device.
With this patch set the Linksys device tree files are moved from
containing the codename to contain a sanitized model name and also
use
it as first entry of the DT compatible list.

Quoted 6 lines

I've no problems adding another compatible to the list. But i don't
like the idea of renaming the files. The file names could be considered ABI! What installers/bootloaders are you going to break by
renaming them?

Quoted 3 lines

Are you okay with adding the new compatible string as first element of
the list? This would already simplify the OpenWrt build system.

Having a mapping table between model names in OpenWrt profiles and .dts
file names in the kernel sources is not that complicated to maintain,
changing the kernel for that reason sounds a bit weak IMHO. --
Florian

#13 lore raw
In reply to Paul Spooren
Quoted 5 lines · Paul Spooren

Hi Andrew,

thank you very much for the quick response!
Are you okay with adding the new compatible string as first element of the list? This would already simplify the OpenWrt build system.

That should be fine. OF will keep searching from first till last for a match.

Quoted 1 line

What about the changed labels? Are they considered ABI too?

You mean LED names. I would consider those ABI. People can have scripts which configure the LEDs how they want, blinking heartbeat, etc.

Quoted 3 lines

Regarding file names, I'm new to ABI policies. Within OpenWrt this is all done via a single line patch, I'm not familiar with any other installers/bootloaders.

Well, it would break how i boot my wrt1900ac. I tftpboot it, grabbing both the kernel and the DB blob from my TFTP server. If the blob changes names, i would need to modify my uboot configuration.

I don't know if Debian has full support for any of these boards, but if i remember correctly, flash-kernel has a database of machine names and DTB file names. My wrt1900ac is quite happy running Debian, but i don't have it booting the Debian way, because i use it for kernel hacking. But maybe there are people out there that do.

Andrew