* [PATCH 01/13] ARM: dts: armada-385-linksys: flatten dtsi
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 02/13] ARM: dts: armada-385-linksys: label nodes Ralph Sennhauser
` (13 subsequent siblings)
14 siblings, 0 replies; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Since the addition of the spi reference two styles are used. Use
references instead of recreating the same structure over and over again.
This helps to distinguish which are changes to the underlying nodes and
which are new additions and helps helps maintainability in general.
Verified the resulting dtb to be binary identical.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
Notes:
Care has been taken to change nothing but flatten and sorting
references by name.
Sorting by internal reg no longer makes sense, would be a pain to
maintain order at least.
Comments have at least one level of indentation, they aren't really
meta comments anyway.
The armada-xp-linksys-mamba.dts already makes much better use of this
style.
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 414 +++++++++++++++---------------
1 file changed, 206 insertions(+), 208 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 2306c45..481e4a3 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -61,214 +61,6 @@
MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
-
- internal-regs {
- i2c at 11000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
- status = "okay";
-
- tmp421 at 4c {
- compatible = "ti,tmp421";
- reg = <0x4c>;
- };
-
- pca9635 at 68 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "nxp,pca9635";
- reg = <0x68>;
- };
- };
-
- /* J10: VCC, NC, RX, NC, TX, GND */
- serial at 12000 {
- status = "okay";
- };
-
- ethernet at 70000 {
- status = "okay";
- phy-mode = "rgmii-id";
- buffer-manager = <&bm>;
- bm,pool-long = <2>;
- bm,pool-short = <3>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
- };
-
- ethernet at 34000 {
- status = "okay";
- phy-mode = "sgmii";
- buffer-manager = <&bm>;
- bm,pool-long = <0>;
- bm,pool-short = <1>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
- };
-
- mdio at 72004 {
- status = "okay";
-
- switch at 0 {
- compatible = "marvell,mv88e6085";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port at 0 {
- reg = <0>;
- label = "lan4";
- };
-
- port at 1 {
- reg = <1>;
- label = "lan3";
- };
-
- port at 2 {
- reg = <2>;
- label = "lan2";
- };
-
- port at 3 {
- reg = <3>;
- label = "lan1";
- };
-
- port at 4 {
- reg = <4>;
- label = "wan";
- };
-
- port at 5 {
- reg = <5>;
- label = "cpu";
- ethernet = <ð2>;
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
- };
- };
- };
- };
-
- sata at a8000 {
- status = "okay";
- };
-
- bm at c8000 {
- status = "okay";
- };
-
- /* USB part of the eSATA/USB 2.0 port */
- usb at 58000 {
- status = "okay";
- };
-
- usb3 at f8000 {
- status = "okay";
- usb-phy = <&usb3_phy>;
- };
-
- flash at d0000 {
- status = "okay";
- num-cs = <1>;
- marvell,nand-keep-config;
- marvell,nand-enable-arbiter;
- nand-on-flash-bbt;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x0000000 0x200000>; /* 2MB */
- read-only;
- };
-
- partition at 100000 {
- label = "u_env";
- reg = <0x200000 0x40000>; /* 256KB */
- };
-
- partition at 140000 {
- label = "s_env";
- reg = <0x240000 0x40000>; /* 256KB */
- };
-
- partition at 900000 {
- label = "devinfo";
- reg = <0x900000 0x100000>; /* 1MB */
- read-only;
- };
-
- /* kernel1 overlaps with rootfs1 by design */
- partition at a00000 {
- label = "kernel1";
- reg = <0xa00000 0x2800000>; /* 40MB */
- };
-
- partition at 1000000 {
- label = "rootfs1";
- reg = <0x1000000 0x2200000>; /* 34MB */
- };
-
- /* kernel2 overlaps with rootfs2 by design */
- partition at 3200000 {
- label = "kernel2";
- reg = <0x3200000 0x2800000>; /* 40MB */
- };
-
- partition at 3800000 {
- label = "rootfs2";
- reg = <0x3800000 0x2200000>; /* 34MB */
- };
-
- /*
- * 38MB, last MB is for the BBT, not writable
- */
- partition at 5a00000 {
- label = "syscfg";
- reg = <0x5a00000 0x2600000>;
- };
-
- /*
- * Unused area between "s_env" and "devinfo".
- * Moved here because otherwise the renumbered
- * partitions would break the bootloader
- * supplied bootargs
- */
- partition at 180000 {
- label = "unused_area";
- reg = <0x280000 0x680000>; /* 6.5MB */
- };
- };
- };
-
- bm-bppi {
- status = "okay";
- };
-
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- /* Marvell 88W8864, 5GHz-only */
- status = "okay";
- };
-
- pcie at 2,0 {
- /* Marvell 88W8864, 2GHz-only */
- status = "okay";
- };
- };
};
usb3_phy: usb3_phy {
@@ -372,6 +164,197 @@
};
};
+&ahci0 {
+ status = "okay";
+};
+
+&bm {
+ status = "okay";
+};
+
+&bm_bppi {
+ status = "okay";
+};
+
+ð0 {
+ status = "okay";
+ phy-mode = "rgmii-id";
+ buffer-manager = <&bm>;
+ bm,pool-long = <2>;
+ bm,pool-short = <3>;
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+};
+
+ð2 {
+ status = "okay";
+ phy-mode = "sgmii";
+ buffer-manager = <&bm>;
+ bm,pool-long = <0>;
+ bm,pool-short = <1>;
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+};
+
+&i2c0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pins>;
+ status = "okay";
+
+ tmp421 at 4c {
+ compatible = "ti,tmp421";
+ reg = <0x4c>;
+ };
+
+ pca9635 at 68 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "nxp,pca9635";
+ reg = <0x68>;
+ };
+};
+
+&nand {
+ status = "okay";
+ num-cs = <1>;
+ marvell,nand-keep-config;
+ marvell,nand-enable-arbiter;
+ nand-on-flash-bbt;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MB */
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "u_env";
+ reg = <0x200000 0x40000>; /* 256KB */
+ };
+
+ partition at 140000 {
+ label = "s_env";
+ reg = <0x240000 0x40000>; /* 256KB */
+ };
+
+ partition at 900000 {
+ label = "devinfo";
+ reg = <0x900000 0x100000>; /* 1MB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
+ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x2800000>; /* 40MB */
+ };
+
+ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x2200000>; /* 34MB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
+ partition at 3200000 {
+ label = "kernel2";
+ reg = <0x3200000 0x2800000>; /* 40MB */
+ };
+
+ partition at 3800000 {
+ label = "rootfs2";
+ reg = <0x3800000 0x2200000>; /* 34MB */
+ };
+
+ /*
+ * 38MB, last MB is for the BBT, not writable
+ */
+ partition at 5a00000 {
+ label = "syscfg";
+ reg = <0x5a00000 0x2600000>;
+ };
+
+ /*
+ * Unused area between "s_env" and "devinfo".
+ * Moved here because otherwise the renumbered
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
+ partition at 180000 {
+ label = "unused_area";
+ reg = <0x280000 0x680000>; /* 6.5MB */
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ switch at 0 {
+ compatible = "marvell,mv88e6085";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 0 {
+ reg = <0>;
+ label = "lan4";
+ };
+
+ port at 1 {
+ reg = <1>;
+ label = "lan3";
+ };
+
+ port at 2 {
+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
+ reg = <3>;
+ label = "lan1";
+ };
+
+ port at 4 {
+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
+ reg = <5>;
+ label = "cpu";
+ ethernet = <ð2>;
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+ };
+ };
+ };
+};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie1 {
+ /* Marvell 88W8864, 5GHz-only */
+ status = "okay";
+};
+
+&pcie2 {
+ /* Marvell 88W8864, 2GHz-only */
+ status = "okay";
+};
+
&pinctrl {
keys_pin: keys-pin {
marvell,pins = "mpp24", "mpp29";
@@ -397,3 +380,18 @@
&spi0 {
status = "disabled";
};
+
+&uart0 {
+ /* J10: VCC, NC, RX, NC, TX, GND */
+ status = "okay";
+};
+
+&usb0 {
+ /* USB part of the eSATA/USB 2.0 port */
+ status = "okay";
+};
+
+&usb3_1 {
+ status = "okay";
+ usb-phy = <&usb3_phy>;
+};
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 02/13] ARM: dts: armada-385-linksys: label nodes
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 01/13] ARM: dts: armada-385-linksys: flatten dtsi Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-22 14:49 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants Ralph Sennhauser
` (12 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Add labels to nodes used by dependants. Also rename node gpio_keys to
gpio-keys to mach the style of the rest of the file as well as the
documented example.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 481e4a3..b7f0a16 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -79,7 +79,7 @@
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
};
- gpio_keys {
+ gpio_keys: gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
@@ -99,7 +99,7 @@
};
};
- gpio-leds {
+ gpio_leds: gpio-leds {
compatible = "gpio-leds";
pinctrl-0 = <&power_led_pin &sata_led_pin>;
pinctrl-names = "default";
@@ -210,7 +210,7 @@
reg = <0x4c>;
};
- pca9635 at 68 {
+ expander0: pca9635 at 68 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "nxp,pca9635";
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 01/13] ARM: dts: armada-385-linksys: flatten dtsi Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 02/13] ARM: dts: armada-385-linksys: label nodes Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-22 14:51 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 04/13] ARM: dts: armada-385-linksys: drop redundant properties in dependants Ralph Sennhauser
` (11 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Flatten dts of individual boards to match the new style used in
armada-385-linksys.dtsi and for the Rango addition.
* Caiman - Linksys WRT1200AC v1 & v2
* Cobra - Linksys WRT1900AC v2
* Shelby - Linksys WRT1900ACS v1 & v2
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
Notes:
power and sata in &gpio_leds don't use references when they could,
feels like overdoing things even though it violates one of the guiding
principles of not recreating structure. If someone thinks such a
change is meaningful I don't mind submitting a followup patch, though
would look odd with the Rango dts.
---
arch/arm/boot/dts/armada-385-linksys-caiman.dts | 99 ++++++++++++-------------
arch/arm/boot/dts/armada-385-linksys-cobra.dts | 99 ++++++++++++-------------
arch/arm/boot/dts/armada-385-linksys-shelby.dts | 99 ++++++++++++-------------
3 files changed, 138 insertions(+), 159 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index f3cee91..765c939 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -44,71 +44,64 @@
model = "Linksys WRT1200AC";
compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",
"marvell,armada380";
+};
- soc {
- internal-regs{
- i2c at 11000 {
-
- pca9635 at 68 {
- #address-cells = <1>;
- #size-cells = <0>;
+&expander0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
- wan_amber at 0 {
- label = "caiman:amber:wan";
- reg = <0x0>;
- };
+ wan_amber at 0 {
+ label = "caiman:amber:wan";
+ reg = <0x0>;
+ };
- wan_white at 1 {
- label = "caiman:white:wan";
- reg = <0x1>;
- };
+ wan_white at 1 {
+ label = "caiman:white:wan";
+ reg = <0x1>;
+ };
- wlan_2g at 2 {
- label = "caiman:white:wlan_2g";
- reg = <0x2>;
- };
+ wlan_2g at 2 {
+ label = "caiman:white:wlan_2g";
+ reg = <0x2>;
+ };
- wlan_5g at 3 {
- label = "caiman:white:wlan_5g";
- reg = <0x3>;
- };
+ wlan_5g at 3 {
+ label = "caiman:white:wlan_5g";
+ reg = <0x3>;
+ };
- usb2 at 5 {
- label = "caiman:white:usb2";
- reg = <0x5>;
- };
+ usb2 at 5 {
+ label = "caiman:white:usb2";
+ reg = <0x5>;
+ };
- usb3_1 at 6 {
- label = "caiman:white:usb3_1";
- reg = <0x6>;
- };
+ usb3_1 at 6 {
+ label = "caiman:white:usb3_1";
+ reg = <0x6>;
+ };
- usb3_2 at 7 {
- label = "caiman:white:usb3_2";
- reg = <0x7>;
- };
+ usb3_2 at 7 {
+ label = "caiman:white:usb3_2";
+ reg = <0x7>;
+ };
- wps_white at 8 {
- label = "caiman:white:wps";
- reg = <0x8>;
- };
+ wps_white at 8 {
+ label = "caiman:white:wps";
+ reg = <0x8>;
+ };
- wps_amber at 9 {
- label = "caiman:amber:wps";
- reg = <0x9>;
- };
- };
- };
- };
+ wps_amber at 9 {
+ label = "caiman:amber:wps";
+ reg = <0x9>;
};
+};
- gpio-leds {
- power {
- label = "caiman:white:power";
- };
+&gpio_leds {
+ power {
+ label = "caiman:white:power";
+ };
- sata {
- label = "caiman:white:sata";
- };
+ sata {
+ label = "caiman:white:sata";
};
};
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index 1110718..2ae1e71 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -44,71 +44,64 @@
model = "Linksys WRT1900ACv2";
compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",
"marvell,armada380";
+};
- soc {
- internal-regs{
- i2c at 11000 {
-
- pca9635 at 68 {
- #address-cells = <1>;
- #size-cells = <0>;
+&expander0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
- wan_amber at 0 {
- label = "cobra:amber:wan";
- reg = <0x0>;
- };
+ wan_amber at 0 {
+ label = "cobra:amber:wan";
+ reg = <0x0>;
+ };
- wan_white at 1 {
- label = "cobra:white:wan";
- reg = <0x1>;
- };
+ wan_white at 1 {
+ label = "cobra:white:wan";
+ reg = <0x1>;
+ };
- wlan_2g at 2 {
- label = "cobra:white:wlan_2g";
- reg = <0x2>;
- };
+ wlan_2g at 2 {
+ label = "cobra:white:wlan_2g";
+ reg = <0x2>;
+ };
- wlan_5g at 3 {
- label = "cobra:white:wlan_5g";
- reg = <0x3>;
- };
+ wlan_5g at 3 {
+ label = "cobra:white:wlan_5g";
+ reg = <0x3>;
+ };
- usb2 at 5 {
- label = "cobra:white:usb2";
- reg = <0x5>;
- };
+ usb2 at 5 {
+ label = "cobra:white:usb2";
+ reg = <0x5>;
+ };
- usb3_1 at 6 {
- label = "cobra:white:usb3_1";
- reg = <0x6>;
- };
+ usb3_1 at 6 {
+ label = "cobra:white:usb3_1";
+ reg = <0x6>;
+ };
- usb3_2 at 7 {
- label = "cobra:white:usb3_2";
- reg = <0x7>;
- };
+ usb3_2 at 7 {
+ label = "cobra:white:usb3_2";
+ reg = <0x7>;
+ };
- wps_white at 8 {
- label = "cobra:white:wps";
- reg = <0x8>;
- };
+ wps_white at 8 {
+ label = "cobra:white:wps";
+ reg = <0x8>;
+ };
- wps_amber at 9 {
- label = "cobra:amber:wps";
- reg = <0x9>;
- };
- };
- };
- };
+ wps_amber at 9 {
+ label = "cobra:amber:wps";
+ reg = <0x9>;
};
+};
- gpio-leds {
- power {
- label = "cobra:white:power";
- };
+&gpio_leds {
+ power {
+ label = "cobra:white:power";
+ };
- sata {
- label = "cobra:white:sata";
- };
+ sata {
+ label = "cobra:white:sata";
};
};
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index c7a8ddd..74f4273 100644
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -44,71 +44,64 @@
model = "Linksys WRT1900ACS";
compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385",
"marvell,armada380";
+};
- soc {
- internal-regs{
- i2c at 11000 {
-
- pca9635 at 68 {
- #address-cells = <1>;
- #size-cells = <0>;
+&expander0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
- wan_amber at 0 {
- label = "shelby:amber:wan";
- reg = <0x0>;
- };
+ wan_amber at 0 {
+ label = "shelby:amber:wan";
+ reg = <0x0>;
+ };
- wan_white at 1 {
- label = "shelby:white:wan";
- reg = <0x1>;
- };
+ wan_white at 1 {
+ label = "shelby:white:wan";
+ reg = <0x1>;
+ };
- wlan_2g at 2 {
- label = "shelby:white:wlan_2g";
- reg = <0x2>;
- };
+ wlan_2g at 2 {
+ label = "shelby:white:wlan_2g";
+ reg = <0x2>;
+ };
- wlan_5g at 3 {
- label = "shelby:white:wlan_5g";
- reg = <0x3>;
- };
+ wlan_5g at 3 {
+ label = "shelby:white:wlan_5g";
+ reg = <0x3>;
+ };
- usb2 at 5 {
- label = "shelby:white:usb2";
- reg = <0x5>;
- };
+ usb2 at 5 {
+ label = "shelby:white:usb2";
+ reg = <0x5>;
+ };
- usb3_1 at 6 {
- label = "shelby:white:usb3_1";
- reg = <0x6>;
- };
+ usb3_1 at 6 {
+ label = "shelby:white:usb3_1";
+ reg = <0x6>;
+ };
- usb3_2 at 7 {
- label = "shelby:white:usb3_2";
- reg = <0x7>;
- };
+ usb3_2 at 7 {
+ label = "shelby:white:usb3_2";
+ reg = <0x7>;
+ };
- wps_white at 8 {
- label = "shelby:white:wps";
- reg = <0x8>;
- };
+ wps_white at 8 {
+ label = "shelby:white:wps";
+ reg = <0x8>;
+ };
- wps_amber at 9 {
- label = "shelby:amber:wps";
- reg = <0x9>;
- };
- };
- };
- };
+ wps_amber at 9 {
+ label = "shelby:amber:wps";
+ reg = <0x9>;
};
+};
- gpio-leds {
- power {
- label = "shelby:white:power";
- };
+&gpio_leds {
+ power {
+ label = "shelby:white:power";
+ };
- sata {
- label = "shelby:white:sata";
- };
+ sata {
+ label = "shelby:white:sata";
};
};
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 04/13] ARM: dts: armada-385-linksys: drop redundant properties in dependants
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (2 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-22 14:52 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 05/13] ARM: dts: armada-385-linksys: bm pools by label order Ralph Sennhauser
` (10 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Drop redundant declaration of #address-cells and #size-cells.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
arch/arm/boot/dts/armada-385-linksys-caiman.dts | 3 ---
arch/arm/boot/dts/armada-385-linksys-cobra.dts | 3 ---
arch/arm/boot/dts/armada-385-linksys-shelby.dts | 3 ---
3 files changed, 9 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index 765c939..05e854a 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -47,9 +47,6 @@
};
&expander0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
wan_amber at 0 {
label = "caiman:amber:wan";
reg = <0x0>;
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index 2ae1e71..5b1662b 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -47,9 +47,6 @@
};
&expander0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
wan_amber at 0 {
label = "cobra:amber:wan";
reg = <0x0>;
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index 74f4273..a909371 100644
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -47,9 +47,6 @@
};
&expander0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
wan_amber at 0 {
label = "shelby:amber:wan";
reg = <0x0>;
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 05/13] ARM: dts: armada-385-linksys: bm pools by label order
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (3 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 04/13] ARM: dts: armada-385-linksys: drop redundant properties in dependants Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup Ralph Sennhauser
` (9 subsequent siblings)
14 siblings, 0 replies; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Which pools we assing doesn't matter. Use the order which doesen't leave
a chance for questions for first time readers.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index b7f0a16..932fca4 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -180,8 +180,8 @@
status = "okay";
phy-mode = "rgmii-id";
buffer-manager = <&bm>;
- bm,pool-long = <2>;
- bm,pool-short = <3>;
+ bm,pool-long = <0>;
+ bm,pool-short = <1>;
fixed-link {
speed = <1000>;
full-duplex;
@@ -192,8 +192,8 @@
status = "okay";
phy-mode = "sgmii";
buffer-manager = <&bm>;
- bm,pool-long = <0>;
- bm,pool-short = <1>;
+ bm,pool-long = <2>;
+ bm,pool-short = <3>;
fixed-link {
speed = <1000>;
full-duplex;
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (4 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 05/13] ARM: dts: armada-385-linksys: bm pools by label order Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-22 14:55 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 07/13] ARM: dts: armada-385-linksys: drop leagcy DSA bindings Ralph Sennhauser
` (8 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Now that we use the reference for the USB3.0 port update the node name
and labels for the phy and vbus to match the label used by
armada-38x.dtsi.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
Notes:
Going by documentation regulator-name is only of informative nature so
changing it should be a non issue.
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 932fca4..6cc1ec7 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -63,16 +63,16 @@
MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
};
- usb3_phy: usb3_phy {
+ usb3_1_phy: usb3_1-phy {
compatible = "usb-nop-xceiv";
- vcc-supply = <®_xhci0_vbus>;
+ vcc-supply = <&usb3_1_vbus>;
};
- reg_xhci0_vbus: xhci0-vbus {
+ usb3_1_vbus: usb3_1-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
- pinctrl-0 = <&xhci0_vbus_pins>;
- regulator-name = "xhci0-vbus";
+ pinctrl-0 = <&usb3_1_vbus_pins>;
+ regulator-name = "usb3_1-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
@@ -371,7 +371,7 @@
marvell,function = "gpio";
};
- xhci0_vbus_pins: xhci0-vbus-pins {
+ usb3_1_vbus_pins: usb3_1-vbus-pins {
marvell,pins = "mpp50";
marvell,function = "gpio";
};
@@ -393,5 +393,5 @@
&usb3_1 {
status = "okay";
- usb-phy = <&usb3_phy>;
+ usb-phy = <&usb3_1_phy>;
};
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup
2017-05-21 12:48 ` [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup Ralph Sennhauser
@ 2017-05-22 14:55 ` Andrew Lunn
2017-05-22 18:13 ` Ralph Sennhauser
0 siblings, 1 reply; 35+ messages in thread
From: Andrew Lunn @ 2017-05-22 14:55 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, May 21, 2017 at 02:48:55PM +0200, Ralph Sennhauser wrote:
> Now that we use the reference for the USB3.0 port update the node name
> and labels for the phy and vbus to match the label used by
> armada-38x.dtsi.
>
> Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
>
> ---
>
> Notes:
>
> Going by documentation regulator-name is only of informative nature so
> changing it should be a non issue.
Does the regulator name appear in /sys somewhere?
Andrew
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup
2017-05-22 14:55 ` Andrew Lunn
@ 2017-05-22 18:13 ` Ralph Sennhauser
0 siblings, 0 replies; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-22 18:13 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 22 May 2017 16:55:15 +0200
Andrew Lunn <andrew@lunn.ch> wrote:
> On Sun, May 21, 2017 at 02:48:55PM +0200, Ralph Sennhauser wrote:
> > Now that we use the reference for the USB3.0 port update the node
> > name and labels for the phy and vbus to match the label used by
> > armada-38x.dtsi.
> >
> > Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
> >
> > ---
> >
> > Notes:
> >
> > Going by documentation regulator-name is only of informative
> > nature so changing it should be a non issue.
>
> Does the regulator name appear in /sys somewhere?
To differentiate between node-name and regulator-name property I changed
the regulator name to usb3_1-vbus-regulator-name
# find /sys -name *usb3_1-vbus*
/sys/kernel/debug/regulator/usb3_1-vbus-regulator-name
/sys/devices/platform/usb3_1-vbus
/sys/firmware/devicetree/base/soc/internal-regs/pinctrl at 18000/usb3_1-vbus-pins
/sys/firmware/devicetree/base/usb3_1-vbus
/sys/bus/platform/devices/usb3_1-vbus
/sys/bus/platform/drivers/reg-fixed-voltage/usb3_1-vbus
So yes, however, only under /sys/kernel/debug and more importantly not
under /sys/class which would be covered by
Documentation/ABI/testing/sysfs-class-regulator.
How the description is worded in regulator.txt [1] under optional
properties, "regulator-name: A string used as a descriptive name for
regulator outputs" doesn't give the impression its considered part of
the ABI implicitly either, well, as you know this might just be my lack
of English skill. As I was uncertain and still am not under the
impression this to be an issue I decided to change it and leave a note
so it doesn't make it in unnoticed and can be discussed / clarified.
Changing the node name has a similar impact but the same can be said
for gpio_keys vs gpio-keys which got your Reviewed-by already.
The new name would better match some recent dts additions beside being
the more obvious choice with the related changes.
[1] Documentation/devicetree/bindings/regulator/regulator.txt
Ralph
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 07/13] ARM: dts: armada-385-linksys: drop leagcy DSA bindings
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (5 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-22 14:55 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes Ralph Sennhauser
` (7 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
The new ones work so there is little reason to keep the legacy bindings.
Use the rework as the oportunity to drop the legacy node.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
Notes:
There is little harm in keeping them but probably no value either, so
use the cleanup series to get rid of them.
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 47 -------------------------------
1 file changed, 47 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 6cc1ec7..f1d6b77 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -115,53 +115,6 @@
linux,default-trigger = "disk-activity";
};
};
-
- dsa at 0 {
- status = "disabled";
-
- compatible = "marvell,dsa";
- #address-cells = <2>;
- #size-cells = <0>;
-
- dsa,ethernet = <ð2>;
- dsa,mii-bus = <&mdio>;
-
- switch at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x0 0>; /* MDIO address 0, switch 0 in tree */
-
- port at 0 {
- reg = <0>;
- label = "lan4";
- };
-
- port at 1 {
- reg = <1>;
- label = "lan3";
- };
-
- port at 2 {
- reg = <2>;
- label = "lan2";
- };
-
- port at 3 {
- reg = <3>;
- label = "lan1";
- };
-
- port at 4 {
- reg = <4>;
- label = "wan";
- };
-
- port at 5 {
- reg = <5>;
- label = "cpu";
- };
- };
- };
};
&ahci0 {
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (6 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 07/13] ARM: dts: armada-385-linksys: drop leagcy DSA bindings Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-22 15:00 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 09/13] ARM: dts: armada-385-linksys: partition layout is board specific Ralph Sennhauser
` (6 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Use IEEE 1541-2002 unit prefixes for sizes.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index f1d6b77..4049eaf 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -52,7 +52,7 @@
memory {
device_type = "memory";
- reg = <0x00000000 0x20000000>; /* 512 MB */
+ reg = <0x00000000 0x20000000>; /* 512 MiB */
};
soc {
@@ -180,50 +180,50 @@
partition at 0 {
label = "u-boot";
- reg = <0x0000000 0x200000>; /* 2MB */
+ reg = <0x0000000 0x200000>; /* 2MiB */
read-only;
};
partition at 100000 {
label = "u_env";
- reg = <0x200000 0x40000>; /* 256KB */
+ reg = <0x200000 0x40000>; /* 256KiB */
};
partition at 140000 {
label = "s_env";
- reg = <0x240000 0x40000>; /* 256KB */
+ reg = <0x240000 0x40000>; /* 256KiB */
};
partition at 900000 {
label = "devinfo";
- reg = <0x900000 0x100000>; /* 1MB */
+ reg = <0x900000 0x100000>; /* 1MiB */
read-only;
};
/* kernel1 overlaps with rootfs1 by design */
partition at a00000 {
label = "kernel1";
- reg = <0xa00000 0x2800000>; /* 40MB */
+ reg = <0xa00000 0x2800000>; /* 40MiB */
};
partition at 1000000 {
label = "rootfs1";
- reg = <0x1000000 0x2200000>; /* 34MB */
+ reg = <0x1000000 0x2200000>; /* 34MiB */
};
/* kernel2 overlaps with rootfs2 by design */
partition at 3200000 {
label = "kernel2";
- reg = <0x3200000 0x2800000>; /* 40MB */
+ reg = <0x3200000 0x2800000>; /* 40MiB */
};
partition at 3800000 {
label = "rootfs2";
- reg = <0x3800000 0x2200000>; /* 34MB */
+ reg = <0x3800000 0x2200000>; /* 34MiB */
};
/*
- * 38MB, last MB is for the BBT, not writable
+ * 38MiB, last MiB is for the BBT, not writable
*/
partition at 5a00000 {
label = "syscfg";
@@ -238,7 +238,7 @@
*/
partition at 180000 {
label = "unused_area";
- reg = <0x280000 0x680000>; /* 6.5MB */
+ reg = <0x280000 0x680000>; /* 6.5MiB */
};
};
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes
2017-05-21 12:48 ` [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes Ralph Sennhauser
@ 2017-05-22 15:00 ` Andrew Lunn
2017-05-22 18:24 ` Ralph Sennhauser
0 siblings, 1 reply; 35+ messages in thread
From: Andrew Lunn @ 2017-05-22 15:00 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, May 21, 2017 at 02:48:57PM +0200, Ralph Sennhauser wrote:
> Use IEEE 1541-2002 unit prefixes for sizes.
Does ePAPR recommend this?
I think this looks ugly, so i would not do it.
Andrew
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes
2017-05-22 15:00 ` Andrew Lunn
@ 2017-05-22 18:24 ` Ralph Sennhauser
2017-05-23 8:33 ` Ralph Sennhauser
0 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-22 18:24 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 22 May 2017 17:00:01 +0200
Andrew Lunn <andrew@lunn.ch> wrote:
> On Sun, May 21, 2017 at 02:48:57PM +0200, Ralph Sennhauser wrote:
> > Use IEEE 1541-2002 unit prefixes for sizes.
>
> Does ePAPR recommend this?
Not directly, but the paper (v1.1) itself is using MiB as well which
could be seen as a recommendation.
SI and NIST to my knowledge explicitly state to not use SI prefixes for
anything but powers of 10. Also as far as I'm aware any relevant
standard body adopted / endorsed these.
>
> I think this looks ugly, so i would not do it.
Needs getting used to indeed. I for myself I can say I've gotten over
it by now. Grepping the Linux tree shows quite a few other examples of
MiB so this one wont feel lonely either.
Ralph
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes
2017-05-22 18:24 ` Ralph Sennhauser
@ 2017-05-23 8:33 ` Ralph Sennhauser
2017-05-23 12:02 ` Andrew Lunn
0 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-23 8:33 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 22 May 2017 20:24:16 +0200
Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote:
> On Mon, 22 May 2017 17:00:01 +0200
> Andrew Lunn <andrew@lunn.ch> wrote:
>
> > On Sun, May 21, 2017 at 02:48:57PM +0200, Ralph Sennhauser wrote:
> > > Use IEEE 1541-2002 unit prefixes for sizes.
> >
> > Does ePAPR recommend this?
>
> Not directly, but the paper (v1.1) itself is using MiB as well which
> could be seen as a recommendation.
Found the pdf again on the web, so here a link:
http://elinux.org/images/c/cf/Power_ePAPR_APPROVED_v1.1.pdf
Funny thing it's using KB(instead of KiB) and MiB. So it's
inconsistent, also the unit with SI prefix would be kB and not KB. So
I'd say ePAPR doesn't care / the authors didn't pay any attention to
this.
Ralph
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes
2017-05-23 8:33 ` Ralph Sennhauser
@ 2017-05-23 12:02 ` Andrew Lunn
0 siblings, 0 replies; 35+ messages in thread
From: Andrew Lunn @ 2017-05-23 12:02 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 23, 2017 at 10:33:02AM +0200, Ralph Sennhauser wrote:
> On Mon, 22 May 2017 20:24:16 +0200
> Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote:
>
> > On Mon, 22 May 2017 17:00:01 +0200
> > Andrew Lunn <andrew@lunn.ch> wrote:
> >
> > > On Sun, May 21, 2017 at 02:48:57PM +0200, Ralph Sennhauser wrote:
> > > > Use IEEE 1541-2002 unit prefixes for sizes.
> > >
> > > Does ePAPR recommend this?
> >
> > Not directly, but the paper (v1.1) itself is using MiB as well which
> > could be seen as a recommendation.
>
> Found the pdf again on the web, so here a link:
> http://elinux.org/images/c/cf/Power_ePAPR_APPROVED_v1.1.pdf
>
> Funny thing it's using KB(instead of KiB) and MiB. So it's
> inconsistent, also the unit with SI prefix would be kB and not KB. So
> I'd say ePAPR doesn't care / the authors didn't pay any attention to
> this.
Hi Ralph
Thanks for checking into this.
My preference, and it is only a preference, is to not do this. Keep
with MB, KB.
Andrew
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 09/13] ARM: dts: armada-385-linksys: partition layout is board specific
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (7 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-23 12:04 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 10/13] ARM: dts: armada-385-linksys: group pins in pinctrl Ralph Sennhauser
` (5 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
Move the partition layout to individual boards. The Linksys WRT 3200 ACM
(Rango) comes with a 256MiB nand flash chip and different layout.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
Dismissed alternatives:
a) Partition layouts as fragments for use with overlay. While the only
alternative which might be worth considering it depends on optional
overlay support. So should be selected by the target or at least be in
the defconfig. Also feels like the mechanism wasn't intended to be
used like this. Also bloats the dtbS.
b) Adding a separate node for each variant would require to delete the
others in the individual dts, just not enabling them isn't enough.
c) Use partition layout dtsi which can be included separately. Two more
dtsi for now.
d) Delete and recreate partitions / nand node for Rango.
e) Make partitions child nodes of a partition-layout node to ease
defining custom layouts. Somewhat big of a change
---
arch/arm/boot/dts/armada-385-linksys-caiman.dts | 67 +++++++++++++++++++++++++
arch/arm/boot/dts/armada-385-linksys-cobra.dts | 67 +++++++++++++++++++++++++
arch/arm/boot/dts/armada-385-linksys-shelby.dts | 67 +++++++++++++++++++++++++
arch/arm/boot/dts/armada-385-linksys.dtsi | 64 +----------------------
4 files changed, 202 insertions(+), 63 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index 05e854a..ee669ae 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -102,3 +102,70 @@
label = "caiman:white:sata";
};
};
+
+&nand {
+ /* 128MiB */
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "u_env";
+ reg = <0x200000 0x40000>; /* 256KiB */
+ };
+
+ partition at 140000 {
+ label = "s_env";
+ reg = <0x240000 0x40000>; /* 256KiB */
+ };
+
+ partition at 900000 {
+ label = "devinfo";
+ reg = <0x900000 0x100000>; /* 1MiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
+ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x2800000>; /* 40MiB */
+ };
+
+ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x2200000>; /* 34MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
+ partition at 3200000 {
+ label = "kernel2";
+ reg = <0x3200000 0x2800000>; /* 40MiB */
+ };
+
+ partition at 3800000 {
+ label = "rootfs2";
+ reg = <0x3800000 0x2200000>; /* 34MiB */
+ };
+
+ /*
+ * 38MiB, last MiB is for the BBT, not writable
+ */
+ partition at 5a00000 {
+ label = "syscfg";
+ reg = <0x5a00000 0x2600000>;
+ };
+
+ /*
+ * Unused area between "s_env" and "devinfo".
+ * Moved here because otherwise the renumbered
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
+ partition at 180000 {
+ label = "unused_area";
+ reg = <0x280000 0x680000>; /* 6.5MiB */
+ };
+};
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index 5b1662b..5169ca8 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -102,3 +102,70 @@
label = "cobra:white:sata";
};
};
+
+&nand {
+ /* 128MiB */
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "u_env";
+ reg = <0x200000 0x40000>; /* 256KiB */
+ };
+
+ partition at 140000 {
+ label = "s_env";
+ reg = <0x240000 0x40000>; /* 256KiB */
+ };
+
+ partition at 900000 {
+ label = "devinfo";
+ reg = <0x900000 0x100000>; /* 1MiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
+ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x2800000>; /* 40MiB */
+ };
+
+ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x2200000>; /* 34MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
+ partition at 3200000 {
+ label = "kernel2";
+ reg = <0x3200000 0x2800000>; /* 40MiB */
+ };
+
+ partition at 3800000 {
+ label = "rootfs2";
+ reg = <0x3800000 0x2200000>; /* 34MiB */
+ };
+
+ /*
+ * 38MiB, last MiB is for the BBT, not writable
+ */
+ partition at 5a00000 {
+ label = "syscfg";
+ reg = <0x5a00000 0x2600000>;
+ };
+
+ /*
+ * Unused area between "s_env" and "devinfo".
+ * Moved here because otherwise the renumbered
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
+ partition at 180000 {
+ label = "unused_area";
+ reg = <0x280000 0x680000>; /* 6.5MiB */
+ };
+};
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index a909371..94aa35b 100644
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -102,3 +102,70 @@
label = "shelby:white:sata";
};
};
+
+&nand {
+ /* 128MiB */
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
+ partition at 100000 {
+ label = "u_env";
+ reg = <0x200000 0x40000>; /* 256KiB */
+ };
+
+ partition at 140000 {
+ label = "s_env";
+ reg = <0x240000 0x40000>; /* 256KiB */
+ };
+
+ partition at 900000 {
+ label = "devinfo";
+ reg = <0x900000 0x100000>; /* 1MiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
+ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x2800000>; /* 40MiB */
+ };
+
+ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x2200000>; /* 34MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
+ partition at 3200000 {
+ label = "kernel2";
+ reg = <0x3200000 0x2800000>; /* 40MiB */
+ };
+
+ partition at 3800000 {
+ label = "rootfs2";
+ reg = <0x3800000 0x2200000>; /* 34MiB */
+ };
+
+ /*
+ * 38MiB, last MiB is for the BBT, not writable
+ */
+ partition at 5a00000 {
+ label = "syscfg";
+ reg = <0x5a00000 0x2600000>;
+ };
+
+ /*
+ * Unused area between "s_env" and "devinfo".
+ * Moved here because otherwise the renumbered
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
+ partition at 180000 {
+ label = "unused_area";
+ reg = <0x280000 0x680000>; /* 6.5MiB */
+ };
+};
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 4049eaf..485abff 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -172,74 +172,12 @@
};
&nand {
+ /* 128MiB or 256MiB */
status = "okay";
num-cs = <1>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x0000000 0x200000>; /* 2MiB */
- read-only;
- };
-
- partition at 100000 {
- label = "u_env";
- reg = <0x200000 0x40000>; /* 256KiB */
- };
-
- partition at 140000 {
- label = "s_env";
- reg = <0x240000 0x40000>; /* 256KiB */
- };
-
- partition at 900000 {
- label = "devinfo";
- reg = <0x900000 0x100000>; /* 1MiB */
- read-only;
- };
-
- /* kernel1 overlaps with rootfs1 by design */
- partition at a00000 {
- label = "kernel1";
- reg = <0xa00000 0x2800000>; /* 40MiB */
- };
-
- partition at 1000000 {
- label = "rootfs1";
- reg = <0x1000000 0x2200000>; /* 34MiB */
- };
-
- /* kernel2 overlaps with rootfs2 by design */
- partition at 3200000 {
- label = "kernel2";
- reg = <0x3200000 0x2800000>; /* 40MiB */
- };
-
- partition at 3800000 {
- label = "rootfs2";
- reg = <0x3800000 0x2200000>; /* 34MiB */
- };
-
- /*
- * 38MiB, last MiB is for the BBT, not writable
- */
- partition at 5a00000 {
- label = "syscfg";
- reg = <0x5a00000 0x2600000>;
- };
-
- /*
- * Unused area between "s_env" and "devinfo".
- * Moved here because otherwise the renumbered
- * partitions would break the bootloader
- * supplied bootargs
- */
- partition at 180000 {
- label = "unused_area";
- reg = <0x280000 0x680000>; /* 6.5MiB */
- };
};
&mdio {
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 10/13] ARM: dts: armada-385-linksys: group pins in pinctrl
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (8 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 09/13] ARM: dts: armada-385-linksys: partition layout is board specific Ralph Sennhauser
@ 2017-05-21 12:48 ` Ralph Sennhauser
2017-05-23 12:06 ` Andrew Lunn
2017-05-21 12:49 ` [PATCH 11/13] ARM: dts: armada-385-linksys: fixup button node names Ralph Sennhauser
` (4 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:48 UTC (permalink / raw)
To: linux-arm-kernel
A pin group per node is sufficient, further specialisation only serves
as documentation which can be a comment just as well. This simplifies
configuring pins for nodes in dependants.
Also use labels which end up right by the node they are intended for.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 485abff..1bb974a 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -83,7 +83,7 @@
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-0 = <&keys_pin>;
+ pinctrl-0 = <&gpio_keys_pins>;
pinctrl-names = "default";
button at 1 {
@@ -101,7 +101,7 @@
gpio_leds: gpio-leds {
compatible = "gpio-leds";
- pinctrl-0 = <&power_led_pin &sata_led_pin>;
+ pinctrl-0 = <&gpio_leds_pins>;
pinctrl-names = "default";
power {
@@ -247,18 +247,15 @@
};
&pinctrl {
- keys_pin: keys-pin {
+ gpio_keys_pins: gpio-keys-pins {
+ /* mpp24: wps, mpp29: reset */
marvell,pins = "mpp24", "mpp29";
marvell,function = "gpio";
};
- power_led_pin: power-led-pin {
- marvell,pins = "mpp55";
- marvell,function = "gpio";
- };
-
- sata_led_pin: sata-led-pin {
- marvell,pins = "mpp54";
+ gpio_leds_pins: gpio-leds-pins {
+ /* mpp54: sata, mpp55: power */
+ marvell,pins = "mpp54", "mpp55";
marvell,function = "gpio";
};
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 11/13] ARM: dts: armada-385-linksys: fixup button node names
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (9 preceding siblings ...)
2017-05-21 12:48 ` [PATCH 10/13] ARM: dts: armada-385-linksys: group pins in pinctrl Ralph Sennhauser
@ 2017-05-21 12:49 ` Ralph Sennhauser
2017-05-23 12:07 ` Andrew Lunn
2017-05-21 12:49 ` [PATCH 12/13] clk: mvebu: add support for 1866MHz variants Ralph Sennhauser
` (3 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:49 UTC (permalink / raw)
To: linux-arm-kernel
Buttons don't have a reg property; drop pseudo address and fixup names
of individual button nodes. Also drop #address-cells and #size-cells
properties.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
arch/arm/boot/dts/armada-385-linksys.dtsi | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 1bb974a..e1f355f 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -81,18 +81,16 @@
gpio_keys: gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
- #size-cells = <0>;
pinctrl-0 = <&gpio_keys_pins>;
pinctrl-names = "default";
- button at 1 {
+ wps {
label = "WPS";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ reset {
label = "Factory Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 12/13] clk: mvebu: add support for 1866MHz variants
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (10 preceding siblings ...)
2017-05-21 12:49 ` [PATCH 11/13] ARM: dts: armada-385-linksys: fixup button node names Ralph Sennhauser
@ 2017-05-21 12:49 ` Ralph Sennhauser
2017-05-23 12:15 ` Andrew Lunn
2017-05-21 12:49 ` [PATCH 13/13] ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango) Ralph Sennhauser
` (2 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:49 UTC (permalink / raw)
To: linux-arm-kernel
The Linksys WRT3200ACM CPU is clocked at 1866MHz. Add 1866MHz to
the list of supported CPU frequencies.
Noticed by the following warning:
[ 0.000000] Selected CPU frequency (16) unsupported
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
drivers/clk/mvebu/armada-38x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/mvebu/armada-38x.c b/drivers/clk/mvebu/armada-38x.c
index 8bccf4e..6a92eb6 100644
--- a/drivers/clk/mvebu/armada-38x.c
+++ b/drivers/clk/mvebu/armada-38x.c
@@ -49,7 +49,8 @@ static const u32 armada_38x_cpu_frequencies[] __initconst = {
0, 0, 0, 0,
1066 * 1000 * 1000, 0, 0, 0,
1332 * 1000 * 1000, 0, 0, 0,
- 1600 * 1000 * 1000,
+ 1600 * 1000 * 1000, 0, 0, 0,
+ 1866 * 1000 * 1000
};
static u32 __init armada_38x_get_cpu_freq(void __iomem *sar)
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 12/13] clk: mvebu: add support for 1866MHz variants
2017-05-21 12:49 ` [PATCH 12/13] clk: mvebu: add support for 1866MHz variants Ralph Sennhauser
@ 2017-05-23 12:15 ` Andrew Lunn
2017-05-23 19:55 ` Ralph Sennhauser
0 siblings, 1 reply; 35+ messages in thread
From: Andrew Lunn @ 2017-05-23 12:15 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, May 21, 2017 at 02:49:01PM +0200, Ralph Sennhauser wrote:
> The Linksys WRT3200ACM CPU is clocked at 1866MHz. Add 1866MHz to
> the list of supported CPU frequencies.
>
> Noticed by the following warning:
> [ 0.000000] Selected CPU frequency (16) unsupported
Are the L2 and DDR clocks using sensible values?
Andrew
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 12/13] clk: mvebu: add support for 1866MHz variants
2017-05-23 12:15 ` Andrew Lunn
@ 2017-05-23 19:55 ` Ralph Sennhauser
0 siblings, 0 replies; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-23 19:55 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 23 May 2017 14:15:14 +0200
Andrew Lunn <andrew@lunn.ch> wrote:
> On Sun, May 21, 2017 at 02:49:01PM +0200, Ralph Sennhauser wrote:
> > The Linksys WRT3200ACM CPU is clocked at 1866MHz. Add 1866MHz to
> > the list of supported CPU frequencies.
> >
> > Noticed by the following warning:
> > [ 0.000000] Selected CPU frequency (16) unsupported
>
> Are the L2 and DDR clocks using sensible values?
>
Hi Andrew
As you expected more changes are needed to fully support the new
CPU frequency. Will send out a V2 later.
Thanks for catching this.
Ralph
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 13/13] ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango)
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (11 preceding siblings ...)
2017-05-21 12:49 ` [PATCH 12/13] clk: mvebu: add support for 1866MHz variants Ralph Sennhauser
@ 2017-05-21 12:49 ` Ralph Sennhauser
2017-05-23 12:18 ` Andrew Lunn
2017-05-23 12:25 ` Andrew Lunn
2017-05-22 18:42 ` [PATCH 00/13] Linksys WRT3200ACM (Rango) support Imre Kaloz
2017-05-23 15:22 ` Gregory CLEMENT
14 siblings, 2 replies; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-21 12:49 UTC (permalink / raw)
To: linux-arm-kernel
The Linksys WRT3200ACM (Rango) is the lates Armada-385 based router in
the Linksys WRT AC Series which got released in October 2016.
The file armada-385-linksys-rango.dts is loosly based off of a DTS
authored by Imre Kaloz.
As Rango is part of the armada-385-linksys family of boards use the
armada-385-linksys.dtsi as basis. As for functional differences to Imre
Kaloz dts, the wlan LEDs aren't connected to the expander chip pca9635
but directly to GPIOs. Then mpp47 controls the USB2.0 port and not the
USB3.0 port, so use the correct GPIO mpp44 for it.
Other changes can be categorized as just cleanup / reorganization due to
using the armada-385-linksys.dtsi.
URL: https://github.com/openwrt/openwrt/blob/0abc3fa5a996daf7dafdc7794ccfe3fa7e955c5a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
Notes:
The sdhci node is taken as is, the current node lets one use the
wireless part of the attached sd8887. There is an issue with the
initalization of the bluetooth firmware though. Haven't had the time
to investigate that in depth so far but shouldn't hold up the Rango
addition.
The non-removable property might be more appropriate than broken-cd
though.
Checkpatch complains about the line length of the URL, though not much
room there. Checkpatch also complains about the vendor prefix linksys
not being documented, however this follows the examples given by the
other boards.
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/armada-385-linksys-rango.dts | 203 +++++++++++++++++++++++++
2 files changed, 204 insertions(+)
create mode 100644 arch/arm/boot/dts/armada-385-linksys-rango.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 9c5e1d9..6be2974 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -999,6 +999,7 @@ 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-synology-ds116.dtb \
armada-385-turris-omnia.dtb \
diff --git a/arch/arm/boot/dts/armada-385-linksys-rango.dts b/arch/arm/boot/dts/armada-385-linksys-rango.dts
new file mode 100644
index 0000000..86f3207
--- /dev/null
+++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -0,0 +1,203 @@
+/*
+ * Device Tree file for the Linksys WRT3200ACM (Rango)
+ *
+ * Copyright (C) 2016 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include "armada-385-linksys.dtsi"
+
+/ {
+ model = "Linksys WRT3200ACM";
+ compatible = "linksys,rango", "linksys,armada385", "marvell,armada385",
+ "marvell,armada380";
+};
+
+&expander0 {
+ wan_amber at 0 {
+ label = "rango:amber:wan";
+ reg = <0x0>;
+ };
+
+ wan_white at 1 {
+ label = "rango:white:wan";
+ reg = <0x1>;
+ };
+
+ usb2 at 5 {
+ label = "rango:white:usb2";
+ reg = <0x5>;
+ };
+
+ usb3_1 at 6 {
+ label = "rango:white:usb3_1";
+ reg = <0x6>;
+ };
+
+ usb3_2 at 7 {
+ label = "rango:white:usb3_2";
+ reg = <0x7>;
+ };
+
+ wps_white at 8 {
+ label = "rango:white:wps";
+ reg = <0x8>;
+ };
+
+ wps_amber at 9 {
+ label = "rango:amber:wps";
+ reg = <0x9>;
+ };
+};
+
+&gpio_leds {
+ power {
+ gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ label = "rango:white:power";
+ };
+
+ sata {
+ gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+ label = "rango:white:sata";
+ };
+
+ wlan_2g {
+ gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
+ label = "rango:white:wlan_2g";
+ };
+
+ wlan_5g {
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+ label = "rango:white:wlan_5g";
+ };
+};
+
+&gpio_leds_pins {
+ marvell,pins = "mpp21", "mpp45", "mpp46", "mpp56";
+};
+
+&nand {
+ /* AMD/Spansion S34ML02G2 256MiB, OEM Layout */
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
+ partition at 200000 {
+ label = "u_env";
+ reg = <0x200000 0x20000>; /* 128KiB */
+ };
+
+ partition at 220000 {
+ label = "s_env";
+ reg = <0x220000 0x40000>; /* 256KiB */
+ };
+
+ partition at 7e0000 {
+ label = "devinfo";
+ reg = <0x7e0000 0x40000>; /* 256KiB */
+ read-only;
+ };
+
+ partition at 820000 {
+ label = "sysdiag";
+ reg = <0x820000 0x1e0000>; /* 1920KiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
+ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x5000000>; /* 80MiB */
+ };
+
+ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x4a00000>; /* 74MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
+ partition at 5a00000 {
+ label = "kernel2";
+ reg = <0x5a00000 0x5000000>; /* 80MiB */
+ };
+
+ partition at 6000000 {
+ label = "rootfs2";
+ reg = <0x6000000 0x4a00000>; /* 74MiB */
+ };
+
+ /*
+ * 86MiB, last MiB is for the BBT, not writable
+ */
+ partition at aa00000 {
+ label = "syscfg";
+ reg = <0xaa00000 0x5600000>;
+ };
+
+ /*
+ * Unused area between "s_env" and "devinfo".
+ * Moved here because otherwise the renumbered
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
+ partition at 180000 {
+ label = "unused_area";
+ reg = <0x260000 0x5c0000>; /* 5.75MiB */
+ };
+};
+
+&sdhci {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdhci_pins>;
+ no-1-8-v;
+ broken-cd;
+ wp-inverted;
+ bus-width = <8>;
+ status = "okay";
+};
+
+&usb3_1_vbus {
+ gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+};
+
+&usb3_1_vbus_pins {
+ marvell,pins = "mpp44";
+};
--
2.10.2
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 00/13] Linksys WRT3200ACM (Rango) support
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (12 preceding siblings ...)
2017-05-21 12:49 ` [PATCH 13/13] ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango) Ralph Sennhauser
@ 2017-05-22 18:42 ` Imre Kaloz
2017-05-23 15:22 ` Gregory CLEMENT
14 siblings, 0 replies; 35+ messages in thread
From: Imre Kaloz @ 2017-05-22 18:42 UTC (permalink / raw)
To: linux-arm-kernel
Hi everyone,
For the whole series feel free to add
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Best,
Imre
On 2017-05-21 05:48, Ralph Sennhauser wrote:
> Hi everyone
>
> This series adds support for the latest model in Linksys WRT AC series
> of routers. The WRT3200ACM was released in October 2016 and the code
> name is Rango.
>
> As it comes with a flash chip twice as big the dts Imre Kaloz has
> written for OpenWrt isn't based on armada-385-linksys.dtsi to avoid
> conflicts. Nonetheless its part of the same family, so the bigger part
> of this series is dedicated to reorganize / modernize / cleanup /
> somewhat future proof the armada-385-linksys.dtsi and it's dependants so
> the dts for the Rango addition can use the same dtsi.
>
> Key differences to the earlier Armada-385 based devices in the series is
> a bigger flash chip, next generation wireless modules in the mini pcie
> slots as well as a Marvell SD8887. Finally the CPU is clocked at 1866
> GHz by default.
>
> The series depends on Linux 4.12-rc1 and is targeted for 4.13.
>
> Ralph
>
>
> Ralph Sennhauser (13):
> ARM: dts: armada-385-linksys: flatten dtsi
> ARM: dts: armada-385-linksys: label nodes
> ARM: dts: armada-385-linksys: flatten dependan
> ARM: dts: armada-385-linksys: drop redundant properties in dependants
> ARM: dts: armada-385-linksys: bm pools by label order
> ARM: dts: armada-385-linksys: usb3 label cleanup
> ARM: dts: armada-385-linksys: drop leagcy DSA bindings
> ARM: dts: armada-385-linksys: use binary unit prefixes
> ARM: dts: armada-385-linksys: partition layout is board specific
> ARM: dts: armada-385-linksys: group pins in pinctrl
> ARM: dts: armada-385-linksys: fixup button node names
> clk: mvebu: add support for 1866MHz variants
> ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango)
>
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/armada-385-linksys-caiman.dts | 187 +++++++-----
> arch/arm/boot/dts/armada-385-linksys-cobra.dts | 187 +++++++-----
> arch/arm/boot/dts/armada-385-linksys-rango.dts | 203 +++++++++++++
> arch/arm/boot/dts/armada-385-linksys-shelby.dts | 187 +++++++-----
> arch/arm/boot/dts/armada-385-linksys.dtsi | 362 ++++++++----------------
> drivers/clk/mvebu/armada-38x.c | 3 +-
> 7 files changed, 695 insertions(+), 435 deletions(-)
> create mode 100644 arch/arm/boot/dts/armada-385-linksys-rango.dts
>
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 00/13] Linksys WRT3200ACM (Rango) support
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
` (13 preceding siblings ...)
2017-05-22 18:42 ` [PATCH 00/13] Linksys WRT3200ACM (Rango) support Imre Kaloz
@ 2017-05-23 15:22 ` Gregory CLEMENT
2017-05-23 16:11 ` Ralph Sennhauser
14 siblings, 1 reply; 35+ messages in thread
From: Gregory CLEMENT @ 2017-05-23 15:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi Ralph,
On dim., mai 21 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote:
> Hi everyone
>
> This series adds support for the latest model in Linksys WRT AC series
> of routers. The WRT3200ACM was released in October 2016 and the code
> name is Rango.
>
> As it comes with a flash chip twice as big the dts Imre Kaloz has
> written for OpenWrt isn't based on armada-385-linksys.dtsi to avoid
> conflicts. Nonetheless its part of the same family, so the bigger part
> of this series is dedicated to reorganize / modernize / cleanup /
> somewhat future proof the armada-385-linksys.dtsi and it's dependants so
> the dts for the Rango addition can use the same dtsi.
>
> Key differences to the earlier Armada-385 based devices in the series is
> a bigger flash chip, next generation wireless modules in the mini pcie
> slots as well as a Marvell SD8887. Finally the CPU is clocked at 1866
> GHz by default.
>
> The series depends on Linux 4.12-rc1 and is targeted for 4.13.
>
> Ralph
>
>
I applied the 11 first patches on mvebu/dt. I added the "Signed-off-by"
from Imre Kaloz <kaloz@openwrt.org> on all of them and the "Reviewed-by"
from Andrew Lunn <andrew@lunn.ch> when approriate.
I also did the following things:
> Ralph Sennhauser (13):
> ARM: dts: armada-385-linksys: flatten dtsi
> ARM: dts: armada-385-linksys: label nodes
Fixed typo pointed by Andrew
> ARM: dts: armada-385-linksys: flatten dependants
Fixed typo pointed by Andrew
Something that I didn't change is the word "dependants", I don't know
what do you means exactly. But not being native speaker I maybe missed
something.
> ARM: dts: armada-385-linksys: drop redundant properties in dependants
> ARM: dts: armada-385-linksys: bm pools by label order
> ARM: dts: armada-385-linksys: usb3 label cleanup
I applied this one because I found Ralph explanation convincing about not
modifying the ABI
> ARM: dts: armada-385-linksys: drop leagcy DSA bindings
Fixed typo in title and commit log
> ARM: dts: armada-385-linksys: use binary unit prefixes
As Ralph I prefer that we use normalized unit. Especially when we use
MiB or KiB then we are sure that we use a power of 2, whereas when we
see KB we don't know if it is 1024B or 1000B.
> ARM: dts: armada-385-linksys: partition layout is board specific
> ARM: dts: armada-385-linksys: group pins in pinctrl
> ARM: dts: armada-385-linksys: fixup button node names
> clk: mvebu: add support for 1866MHz variants
I didn't apply this one as it must go through the clk tree and there was
also a pending question from Andrew.
> ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango)
For this last one do you finally agree to use "non-removable" instead of
"broken-cd" ?
Gregory
>
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/armada-385-linksys-caiman.dts | 187 +++++++-----
> arch/arm/boot/dts/armada-385-linksys-cobra.dts | 187 +++++++-----
> arch/arm/boot/dts/armada-385-linksys-rango.dts | 203 +++++++++++++
> arch/arm/boot/dts/armada-385-linksys-shelby.dts | 187 +++++++-----
> arch/arm/boot/dts/armada-385-linksys.dtsi | 362 ++++++++----------------
> drivers/clk/mvebu/armada-38x.c | 3 +-
> 7 files changed, 695 insertions(+), 435 deletions(-)
> create mode 100644 arch/arm/boot/dts/armada-385-linksys-rango.dts
>
> --
> 2.10.2
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 00/13] Linksys WRT3200ACM (Rango) support
2017-05-23 15:22 ` Gregory CLEMENT
@ 2017-05-23 16:11 ` Ralph Sennhauser
0 siblings, 0 replies; 35+ messages in thread
From: Ralph Sennhauser @ 2017-05-23 16:11 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 23 May 2017 17:22:05 +0200
Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
> Hi Ralph,
>
> On dim., mai 21 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com>
> wrote:
>
> > Hi everyone
> >
> > This series adds support for the latest model in Linksys WRT AC
> > series of routers. The WRT3200ACM was released in October 2016 and
> > the code name is Rango.
> >
> > As it comes with a flash chip twice as big the dts Imre Kaloz has
> > written for OpenWrt isn't based on armada-385-linksys.dtsi to avoid
> > conflicts. Nonetheless its part of the same family, so the bigger
> > part of this series is dedicated to reorganize / modernize /
> > cleanup / somewhat future proof the armada-385-linksys.dtsi and
> > it's dependants so the dts for the Rango addition can use the same
> > dtsi.
> >
> > Key differences to the earlier Armada-385 based devices in the
> > series is a bigger flash chip, next generation wireless modules in
> > the mini pcie slots as well as a Marvell SD8887. Finally the CPU is
> > clocked at 1866 GHz by default.
> >
> > The series depends on Linux 4.12-rc1 and is targeted for 4.13.
> >
> > Ralph
> >
> >
>
Hi Gregory,
> I applied the 11 first patches on mvebu/dt. I added the
> "Signed-off-by" from Imre Kaloz <kaloz@openwrt.org> on all of them
> and the "Reviewed-by" from Andrew Lunn <andrew@lunn.ch> when
> approriate.
That was a lot faster than expected
>
> I also did the following things:
>
> > Ralph Sennhauser (13):
> > ARM: dts: armada-385-linksys: flatten dtsi
Just noticed the commit message has "helps helps" in it.
> > ARM: dts: armada-385-linksys: label nodes
> Fixed typo pointed by Andrew
>
> > ARM: dts: armada-385-linksys: flatten dependants
> Fixed typo pointed by Andrew
>
> Something that I didn't change is the word "dependants", I don't know
> what do you means exactly. But not being native speaker I maybe missed
> something.
Dependants is the noun, tho that might be a British English thing (what
I had in school). I learned English as 4th/5th language together with
Latin, so beside being a mixture of American and British English some
custom English surfaces from time to time. :)
>
> > ARM: dts: armada-385-linksys: drop redundant properties in
> > dependants ARM: dts: armada-385-linksys: bm pools by label order
> > ARM: dts: armada-385-linksys: usb3 label cleanup
>
> I applied this one because I found Ralph explanation convincing about
> not modifying the ABI
>
> > ARM: dts: armada-385-linksys: drop leagcy DSA bindings
> Fixed typo in title and commit log
>
Didn't notice until you pointed it out. Thanks.
> > ARM: dts: armada-385-linksys: use binary unit prefixes
>
> As Ralph I prefer that we use normalized unit. Especially when we use
> MiB or KiB then we are sure that we use a power of 2, whereas when we
> see KB we don't know if it is 1024B or 1000B.
>
> > ARM: dts: armada-385-linksys: partition layout is board specific
> > ARM: dts: armada-385-linksys: group pins in pinctrl
> > ARM: dts: armada-385-linksys: fixup button node names
>
> > clk: mvebu: add support for 1866MHz variants
>
> I didn't apply this one as it must go through the clk tree and there
> was also a pending question from Andrew.
And the way he formulated it he probably already knows that more is
needed. I'll investigate it.
>
> > ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango)
>
> For this last one do you finally agree to use "non-removable" instead
> of "broken-cd" ?
The card isn't really accessible and as such polling sort of pointless.
I prefer non-removable but left it as-is for V1.
Thanks
Ralph
PS: Also thanks for applying the reminder of the pwm-fan series.
^ permalink raw reply [flat|nested] 35+ messages in thread