ramips: move partitions into partition table node

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / WHR-300HP2.dts

diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts
index 1ccfa2bb4dbd97f976d72f9358166c7e5714b35f..7acc84f168d1d2688fd2be90eb7621570f4e8367 100644 (file)
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/WHR-300HP2.dts
@@ -1,139 +1,153 @@
 /dts-v1/;
 
-/include/ "mt7620a.dtsi"
+#include "mt7620a.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-       compatible = "ralink,mt7620a-soc";
+       compatible = "buffalo,whr-300hp2", "ralink,mt7620a-soc";
        model = "Buffalo WHR-300HP2";
 
-       palmbus@10000000 {
-               gpio2: gpio@660 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "en25q64";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25fl064k";
-                               spi-max-frequency = <10000000>;
-
-                               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;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-                               ralink,function = "gpio";
-                       };
-                       pa {
-                               ralink,group = "pa";
-                               ralink,function = "pa";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&ephy_pins>;
-
-               ralink,port-map = "llllw";
-       };
-
-       gsw@10110000 {
-               ralink,port4 = "ephy";
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
+       aliases {
+               led-status = &led_power_green;
        };
 
        gpio-leds {
                compatible = "gpio-leds";
+
                power {
-                       label = "buffalo:red:power";
-                       gpios = <&gpio0 7 1>;
+                       label = "whr-300hp2:red:power";
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
-               status {
-                       label = "buffalo:green:status";
-                       gpios = <&gpio0 8 1>;
+
+               wifi {
+                       label = "whr-300hp2:green:wifi";
+                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
-               power2 {
-                       label = "buffalo:green:power";
-                       gpios = <&gpio0 9 1>;
+
+               led_power_green: power2 {
+                       label = "whr-300hp2:green:power";
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
-               status2 {
-                       label = "buffalo:orange:status";
-                       gpios = <&gpio0 10 1>;
+
+               wifi2 {
+                       label = "whr-300hp2:orange:wifi";
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                };
+
                internet {
-                       label = "buffalo:green:internet";
-                       gpios = <&gpio2 17 1>;
+                       label = "whr-300hp2:green:internet";
+                       gpios = <&gpio2 17 GPIO_ACTIVE_LOW>;
                };
+
                router {
-                       label = "buffalo:green:router";
-                       gpios = <&gpio2 18 1>;
+                       label = "whr-300hp2:green:router";
+                       gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;
                };
+
                router2 {
-                       label = "buffalo:orange:router";
-                       gpios = <&gpio2 19 1>;
+                       label = "whr-300hp2:orange:router";
+                       gpios = <&gpio2 19 GPIO_ACTIVE_LOW>;
                };
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
+
                reset {
                        label = "reset";
-                       gpios = <&gpio2 12 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
+
                aoss {
                        label = "aoss";
-                       gpios = <&gpio2 13 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
+
                ap {
                        label = "ap";
-                       gpios = <&gpio2 14 1>;
-                       linux,code = <0x100>;
-                       linux,input-type = <5>; /* EV_SW */
+                       gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_0>;
+                       linux,input-type = <EV_SW>;
                };
+
                bridge {
                        label = "bridge";
-                       gpios = <&gpio2 15 1>;
-                       linux,code = <0x100>;
-                       linux,input-type = <5>; /* EV_SW */
+                       gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_0>;
+                       linux,input-type = <EV_SW>;
                };
        };
 };
+
+&gpio2 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <10000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #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;
+                       };
+
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x7b0000>;
+                       };
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
+       mediatek,portmap = "llllw";
+};
+
+&gsw {
+       mediatek,port4 = "ephy";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
+};