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`.
Signed-off-by: Paul Spooren <mail@xxxxxxxxxxx>
CC: Rob Herring <robh+dt@xxxxxxxxxx>
CC: Jason Cooper <jason@xxxxxxxxxxxxxx>
CC: Andrew Lunn <andrew@xxxxxxx>
CC: Gregory Clement <gregory.clement@xxxxxxxxxxx>
CC: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>
CC: Daniel Golle <daniel@xxxxxxxxxxxxxx>
CC: Adrian Schmutzler <freifunk@xxxxxxxxxxxxxxxxxxx>
---
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%)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index cf288adb8fe0..be45b5fb4f95 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-wrt1900ac-v2.dts
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
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-wrt1900ac-v2.dts
@@ -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";
};
};
--
2.25.1
