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 acd4ce47e54c0190790cc8691be109bfc81bb4ef..7acc84f168d1d2688fd2be90eb7621570f4e8367 100644 (file)
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/WHR-300HP2.dts
@@ -2,79 +2,84 @@
 
 #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";
 
+       aliases {
+               led-status = &led_power_green;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
 
                power {
                        label = "whr-300hp2:red:power";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
                        label = "whr-300hp2:green:wifi";
-                       gpios = <&gpio0 8 1>;
+                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
-               power2 {
+               led_power_green: power2 {
                        label = "whr-300hp2:green:power";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wifi2 {
                        label = "whr-300hp2:orange:wifi";
-                       gpios = <&gpio0 10 1>;
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                };
 
                internet {
                        label = "whr-300hp2:green:internet";
-                       gpios = <&gpio2 17 1>;
+                       gpios = <&gpio2 17 GPIO_ACTIVE_LOW>;
                };
 
                router {
                        label = "whr-300hp2:green:router";
-                       gpios = <&gpio2 18 1>;
+                       gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;
                };
 
                router2 {
                        label = "whr-300hp2:orange:router";
-                       gpios = <&gpio2 19 1>;
+                       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>;
                };
        };
 };
@@ -87,34 +92,37 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <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>;
+               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>;
+                       };
                };
        };
 };
@@ -125,11 +133,6 @@
                        ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
 
@@ -145,4 +148,6 @@
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };