netifd: drop conflicting 'device' interface property

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

diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-stg212.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-stg212.dts
index 5d838065ce0b226bb689113f4c7dac2d22736d54..ad93d4ec154c1841edc9a94ae23d2c4376938e35 100644 (file)
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-stg212.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-stg212.dts
@@ -10,11 +10,13 @@
 
 #include "ox820.dtsi"
 
+#include <dt-bindings/input/input.h>
+
 / {
        model = "MitraStar Technology Corp. STG-212";
 
        chosen {
-               bootargs = "console=ttyS0,115200n8 earlyprintk=serial";
+               bootargs = "console=ttyS0,115200n8 earlyprintk=serial mem=128M";
        };
 
        uart@44200000 {
@@ -25,20 +27,6 @@
                status = "okay";
        };
 
-       nand@41000000 {
-               status = "okay";
-
-               partition@0 {
-                       label = "boot";
-                       reg = <0x00000000 0x00e00000>;
-                       /*read-only;*/
-               };
-
-               partition@e00000 {
-                       label = "ubi";
-                       reg = <0x00e00000 0x07200000>;
-               };
-       };
 
        ethernet@40400000 {
                status = "okay";
@@ -57,12 +45,12 @@
                reset {
                        label = "reset";
                        gpios = <&GPIOB 11 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                copy {
                        label = "copy";
                        gpios = <&GPIOB 13 1>;
-                       linux,code = <0x85>;
+                       linux,code = <KEY_COPY>;
                };
        };
 
@@ -89,3 +77,26 @@
        };
 
 };
+
+&nandc {
+       status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               nand-ecc-mode = "soft";
+               nand-ecc-algo = "hamming";
+
+               partition@0 {
+                       label = "boot";
+                       reg = <0x00000000 0x00e00000>;
+                       read-only;
+               };
+
+               partition@e00000 {
+                       label = "ubi";
+                       reg = <0x00e00000 0x07200000>;
+               };
+       };
+};