aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.14
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2019-03-03 18:13:25 +0100
committerDaniel Golle <daniel@makrotopia.org>2019-03-03 18:14:41 +0100
commit1bfe1ce5c4ce490337193b253b731fe2390bbe7f (patch)
treef512cb406343660a4708e76f6f91f0b480e2232b /target/linux/oxnas/patches-4.14
parent9ee8c8daf43416b579b3bf99e389a4c8dac145cb (diff)
downloadupstream-1bfe1ce5c4ce490337193b253b731fe2390bbe7f.tar.gz
upstream-1bfe1ce5c4ce490337193b253b731fe2390bbe7f.tar.bz2
upstream-1bfe1ce5c4ce490337193b253b731fe2390bbe7f.zip
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>
Diffstat (limited to 'target/linux/oxnas/patches-4.14')
-rw-r--r--target/linux/oxnas/patches-4.14/020-nand-partitions-on-pogoplug-v3.patch32
-rw-r--r--target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch13
2 files changed, 45 insertions, 0 deletions
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";
+