oxnas: merge Pogoplug V3 DTS patches into one file

As it seeems these patches are for OpenWrt and they are not going to be merged
to mainline, let's merge them to improve maintainability.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>

diff --git a/target/linux/oxnas/patches-5.4/010-add-console-to-pogoplogv3-bootargs.patch b/target/linux/oxnas/patches-5.4/010-add-console-to-pogoplogv3-bootargs.patch
deleted file mode 100644 (file)
index 7fdc302..0000000
--- a/target/linux/oxnas/patches-5.4/010-add-console-to-pogoplogv3-bootargs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-+++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-@@ -14,7 +14,7 @@
-       compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
- 
-       chosen {
--              bootargs = "earlyprintk";
-+              bootargs = "earlyprintk console=ttyS0,115200";
-               stdout-path = "serial0:115200n8";
-       };
- 

diff --git a/target/linux/oxnas/patches-5.4/010-pogoplug-series-3.patch b/target/linux/oxnas/patches-5.4/010-pogoplug-series-3.patch
new file mode 100644 (file)
index 0000000..4410235
--- /dev/null
+++ b/target/linux/oxnas/patches-5.4/010-pogoplug-series-3.patch
@@ -0,0 +1,82 @@
+- add compatible string
+- add console to bootargs
+- add led aliases
+- adjust nand partition table
+---
+--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
+@@ -11,10 +11,10 @@
+ / {
+       model = "Cloud Engines PogoPlug Series 3";
+ 
+-      compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
++      compatible = "cloudengines,pogoplug-series-3", "cloudengines,pogoplugv3", "oxsemi,ox820";
+ 
+       chosen {
+-              bootargs = "earlyprintk";
++              bootargs = "earlyprintk console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
+       };
+ 
+@@ -27,24 +27,28 @@
+               serial0 = &uart0;
+               gpio0 = &gpio0;
+               gpio1 = &gpio1;
++              led-boot = &led_status;
++              led-failsafe = &led_warn;
++              led-running = &led_act;
++              led-upgrade = &led_warn;
+       };
+ 
+       leds {
+               compatible = "gpio-leds";
+ 
+-              blue {
++              led_status: blue {
+                       label = "pogoplug:blue";
+                       gpios = <&gpio0 2 0>;
+                       default-state = "keep";
+               };
+ 
+-              orange {
++              led_warn: orange {
+                       label = "pogoplug:orange";
+                       gpios = <&gpio1 16 1>;
+                       default-state = "keep";
+               };
+ 
+-              green {
++              led_act: green {
+                       label = "pogoplug:green";
+                       gpios = <&gpio1 17 1>;
+                       default-state = "keep";
+@@ -73,11 +77,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-5.4/020-nand-partitions-on-pogoplug-v3.patch b/target/linux/oxnas/patches-5.4/020-nand-partitions-on-pogoplug-v3.patch
deleted file mode 100644 (file)
index 4adf8bc..0000000
--- a/target/linux/oxnas/patches-5.4/020-nand-partitions-on-pogoplug-v3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-+++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-@@ -73,11 +73,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-5.4/030-led-aliases-on-pogoplug-v3.patch b/target/linux/oxnas/patches-5.4/030-led-aliases-on-pogoplug-v3.patch
deleted file mode 100644 (file)
index 8fb1d23..0000000
--- a/target/linux/oxnas/patches-5.4/030-led-aliases-on-pogoplug-v3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-+++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-@@ -27,24 +27,28 @@
-               serial0 = &uart0;
-               gpio0 = &gpio0;
-               gpio1 = &gpio1;
-+              led-boot = &led_status;
-+              led-failsafe = &led_warn;
-+              led-running = &led_act;
-+              led-upgrade = &led_warn;
-       };
- 
-       leds {
-               compatible = "gpio-leds";
- 
--              blue {
-+              led_status: blue {
-                       label = "pogoplug:blue";
-                       gpios = <&gpio0 2 0>;
-                       default-state = "keep";
-               };
- 
--              orange {
-+              led_warn: orange {
-                       label = "pogoplug:orange";
-                       gpios = <&gpio1 16 1>;
-                       default-state = "keep";
-               };
- 
--              green {
-+              led_act: green {
-                       label = "pogoplug:green";
-                       gpios = <&gpio1 17 1>;
-                       default-state = "keep";

diff --git a/target/linux/oxnas/patches-5.4/040-pogoplug-series-3-compatible-string.patch b/target/linux/oxnas/patches-5.4/040-pogoplug-series-3-compatible-string.patch
deleted file mode 100644 (file)
index 625d660..0000000
--- a/target/linux/oxnas/patches-5.4/040-pogoplug-series-3-compatible-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-+++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-@@ -11,7 +11,7 @@
- / {
-       model = "Cloud Engines PogoPlug Series 3";
- 
--      compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
-+      compatible = "cloudengines,pogoplug-series-3", "cloudengines,pogoplugv3", "oxsemi,ox820";
- 
-       chosen {
-               bootargs = "earlyprintk console=ttyS0,115200";