ramips: move partitions into partition table node

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / MZK-W300NH2.dts

diff --git a/target/linux/ramips/dts/MZK-W300NH2.dts b/target/linux/ramips/dts/MZK-W300NH2.dts
index 06cc2920235c4fee6f376bf185a419b58f452425..af172f1806f2f42e217218e3f157d77da5203720 100644 (file)
--- a/target/linux/ramips/dts/MZK-W300NH2.dts
+++ b/target/linux/ramips/dts/MZK-W300NH2.dts
@@ -1,18 +1,16 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-       compatible = "MZK-W300NH2", "ralink,rt3052-soc";
+       compatible = "planex,mzk-w300nh2", "ralink,rt3052-soc";
        model = "Planex MZK-W300NH2";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
+       aliases {
+               led-status = &led_power;
        };
 
        cfi@1f000000 {
@@ -20,92 +18,103 @@
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
                device-width = <2>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
 
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@3e0000 {
-                       label = "cimage";
-                       reg = <0x3e0000 0x20000>;
-                       read-only;
-               };
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
 
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x390000>;
-               };
-       };
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
 
-       esw@10110000 {
-               ralink,portmap = <0x2f>;
-       };
+                       partition@3e0000 {
+                               label = "cimage";
+                               reg = <0x3e0000 0x20000>;
+                               read-only;
+                       };
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x390000>;
+                       };
+               };
        };
 
        gpio-leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "mzk-w300nh2:green:power";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "mzk-w300nh2:amber:wlan";
-                       gpios = <&gpio0 14 1>;
+                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "mzk-w300nh2:amber:wps";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 12 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
 
                rt {
                        label = "rt";
-                       gpios = <&gpio0 13 1>;
-                       linux,code = <0x100>;
+                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_0>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
                };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};