oxnas: cheery-pick DTS improvements from master

 4a954e8620 oxnas: dts: Unify naming of gpio-keys nodes
 9292822023 oxnas: dts: Unify naming of gpio-led nodes
 994428f395 oxnas: add missing NAND partitions
 858aebc0ef oxnas: unify MTD partition names
 e2fea41ad6 oxnas: fix forgotten MTD partition name
 42f2e07ba0 oxnas: cloudengines,pogoplug*: enable USB ports

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

6 files changed, 97 insertions, 11 deletions

diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
index 90ea15d400..f0fa928f3d 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
@@ -39,7 +39,7 @@
 		};
 	};
 
-	gpio-keys-polled {
+	keys {
 		compatible = "gpio-keys-polled";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_buttons>;
@@ -58,7 +58,7 @@
 		};
 	};
 
-	gpio-leds {
+	leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_leds>;
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
index 2872d40e3d..fc1aa6b4e3 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
@@ -74,11 +74,27 @@
 		nand-ecc-algo = "hamming";
 
 		partition@0 {
-			label = "boot";
-			reg = <0x00000000 0x00e00000>;
+			label = "stage1";
+			reg = <0x00000000 0x00040000>;
 			read-only;
 		};
 
+		partition@40000 {
+			label = "u-boot";
+			reg = <0x00040000 0x00380000>;
+			read-only;
+		};
+
+		partition@3c0000 {
+			label = "u-boot-env";
+			reg = <0x003c0000 0x00080000>;
+		};
+
+		partition@440000 {
+			label = "kernel";
+			reg = <0x00440000 0x009c0000>;
+		};
+
 		partition@e00000 {
 			label = "ubi";
 			reg = <0x00e00000 0x07200000>;
@@ -86,6 +102,10 @@
 	};
 };
 
+&ehci {
+	status = "okay";
+};
+
 &etha {
 	status = "okay";
 
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
index cc8d640ee0..7f25abc104 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
@@ -25,7 +25,7 @@
 		gpio1 = &gpio1;
 	};
 
-	gpio-keys-polled {
+	keys {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -43,7 +43,7 @@
 		};
 	};
 
-	gpio-leds {
+	leds {
 		compatible = "gpio-leds";
 		status {
 			label = "zyxel:blue:status";
@@ -88,11 +88,27 @@
 		nand-ecc-algo = "hamming";
 
 		partition@0 {
-			label = "boot";
-			reg = <0x00000000 0x00e00000>;
+			label = "stage1";
+			reg = <0x00000000 0x00040000>;
 			read-only;
 		};
 
+		partition@40000 {
+			label = "u-boot";
+			reg = <0x00040000 0x00380000>;
+			read-only;
+		};
+
+		partition@3c0000 {
+			label = "u-boot-env";
+			reg = <0x003c0000 0x00080000>;
+		};
+
+		partition@440000 {
+			label = "kernel";
+			reg = <0x00440000 0x009c0000>;
+		};
+
 		partition@e00000 {
 			label = "ubi";
 			reg = <0x00e00000 0x07200000>;
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
index 9186d08585..8525d861b2 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
@@ -37,7 +37,7 @@
 		};
 	};
 
-	gpio-keys-polled {
+	keys {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -65,7 +65,7 @@
 		};
 	};
 
-	gpio-leds {
+	leds {
 		compatible = "gpio-leds";
 		status {
 			label = "kd20:blue:status";
@@ -145,10 +145,15 @@
 
 		partition@40000 {
 			label = "u-boot";
-			reg = <0x00040000 0x00200000>;
+			reg = <0x00040000 0x001e0000>;
 			read-only;
 		};
 
+		partition@220000 {
+			label = "u-boot-env";
+			reg = <0x00220000 0x00020000>;
+		};
+
 		partition@240000 {
 			label = "initrd";
 			reg = <0x00240000 0x00600000>;
diff --git a/target/linux/oxnas/patches-4.14/020-nand-partitions-on-pogoplug-v3.patch b/target/linux/oxnas/patches-4.14/020-nand-partitions-on-pogoplug-v3.patch
new file mode 100644
index 0000000000..1136240882
--- /dev/null
+++ b/target/linux/oxnas/patches-4.14/020-nand-partitions-on-pogoplug-v3.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
+@@ -74,11 +74,27 @@
+ 		nand-ecc-algo = "hamming";
+ 
+ 		partition@0 {
+-			label = "boot";
+-			reg = <0x00000000 0x00e00000>;
++			label = "stage1";
++			reg = <0x00000000 0x00040000>;
+ 			read-only;
+ 		};
+ 
++		partition@40000 {
++			label = "u-boot";
++			reg = <0x00040000 0x00380000>;
++			read-only;
++		};
++
++		partition@3c0000 {
++			label = "u-boot-env";
++			reg = <0x003c0000 0x00080000>;
++		};
++
++		partition@440000 {
++			label = "kernel";
++			reg = <0x00440000 0x009c0000>;
++		};
++
+ 		partition@e00000 {
+ 			label = "ubi";
+ 			reg = <0x00e00000 0x07200000>;
diff --git a/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch b/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch
index b4e34e5e3f..69db38ed19 100644
--- a/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch
+++ b/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch
@@ -49,3 +49,16 @@
  		apb-bridge@44000000 {
  			#address-cells = <1>;
  			#size-cells = <1>;
+--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
+@@ -106,6 +106,10 @@
+ 	};
+ };
+ 
++&ehci {
++	status = "okay";
++};
++
+ &etha {
+ 	status = "okay";
+