kernel: bump 4.14 to 4.14.50 for 18.06

[openwrt/openwrt.git] / target / linux / oxnas / files / arch / arm / boot / dts / ox820-kd20.dts

diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts
index b5c79dede386d8cb51844ea708667b131d216792..a59addccacddf20054f68f82e44f3d11552c3602 100644 (file)
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts
@@ -9,6 +9,8 @@
 /dts-v1/;
 #include "ox820.dtsi"
 
+#include <dt-bindings/input/input.h>
+
 / {
        model = "Shuttle KD20";
 
@@ -29,37 +31,6 @@
                nr-ports = <2>;
        };
 
-       nand@41000000 {
-               status = "okay";
-
-               partition@0 {
-                       label = "stage1";
-                       reg = <0x00000000 0x00040000>;
-                       read-only;
-               };
-
-               partition@40000 {
-                       label = "u-boot";
-                       reg = <0x00040000 0x00200000>;
-                       read-only;
-               };
-
-               partition@240000 {
-                       label = "initrd";
-                       reg = <0x00240000 0x00600000>;
-               };
-
-               partition@840000 {
-                       label = "kernel";
-                       reg = <0x00840000 0x007C0000>;
-               };
-
-               partition@e00000 {
-                       label = "ubi";
-                       reg = <0x01000000 0x07000000>;
-               };
-       };
-
        ethernet@40400000 {
                status = "okay";
                snps,phy-addr = <1>;
@@ -91,17 +62,17 @@
                power {
                        label = "power";
                        gpios = <&GPIOA 10 1>;
-                       linux,code = <116>;
+                       linux,code = <KEY_POWER>;
                };
                reset {
                        label = "reset";
                        gpios = <&GPIOA 11 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                eject1 {
                        label = "eject1";
                        gpios = <&GPIOA 5 1>;
-                       linux,code = <161>;
+                       linux,code = <KEY_EJECTCD>;
                };
                eject2 {
                        label = "eject2";
@@ -161,3 +132,42 @@
                gpios = <&GPIOA 9 0>;
        };
 };
+
+&nandc {
+       status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               nand-ecc-mode = "soft";
+               nand-ecc-algo = "hamming";
+
+               partition@0 {
+                       label = "stage1";
+                       reg = <0x00000000 0x00040000>;
+                       read-only;
+               };
+
+               partition@40000 {
+                       label = "u-boot";
+                       reg = <0x00040000 0x00200000>;
+                       read-only;
+               };
+
+               partition@240000 {
+                       label = "initrd";
+                       reg = <0x00240000 0x00600000>;
+               };
+
+               partition@840000 {
+                       label = "kernel";
+                       reg = <0x00840000 0x007C0000>;
+               };
+
+               partition@e00000 {
+                       label = "ubi";
+                       reg = <0x01000000 0x07000000>;
+               };
+       };
+};