ramips: fix pinctrl regression

[openwrt/openwrt.git] / target / linux / ramips / dts / RT-N15.dts

diff --git a/target/linux/ramips/dts/RT-N15.dts b/target/linux/ramips/dts/RT-N15.dts
index 23842d48b81c4f2e7c3a001fb60e692bf480bbdf..d5bcbe3409e26dcf7ee12fc1014ddde87504dde0 100644 (file)
--- a/target/linux/ramips/dts/RT-N15.dts
+++ b/target/linux/ramips/dts/RT-N15.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "rt2880.dtsi"
+#include "rt2880.dtsi"
 
 / {
        #address-cells = <1>;
@@ -8,25 +8,9 @@
        compatible = "RT-N15", "ralink,rt2880-soc";
        model = "Asus RT-N15";
 
-       palmbus@300000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartlite", "mdio";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
-
                bank-width = <2>;
                device-width = <2>;
                #address-cells = <1>;
@@ -37,59 +21,43 @@
                        reg = <0x0 0x30000>;
                        read-only;
                };
+
                partition@30000 {
                        label = "uboot-env";
                        reg = <0x30000 0x10000>;
                        read-only;
                };
+
                factory: partition@40000 {
                        label = "factory";
                        reg = <0x40000 0x10000>;
                        read-only;
                };
+
                partition@50000 {
                        label = "firmware";
                        reg = <0x50000 0x3b0000>;
                };
        };
 
-       ethernet@400000 {
-               status = "okay";
-               mtd-mac-address = <&factory 0x4>;
-
-                port@0 {
-                       ralink,fixed-link = <1000 1 1 1>;
-               };
-
-               mdio-bus {
-                       status = "okay";
-                       phy0: ethernet-phy@0 {
-                               phy-mode = "mii";
-                               reg = <0>;
-                       };
-               };
-       };
-
        rtl8366s {
                compatible = "realtek,rtl8366s";
                gpio-sda = <&gpio0 1 0>;
                gpio-sck = <&gpio0 2 0>;
        };
 
-       wmac@480000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <100>;
+
                wps {
                        label = "wps";
                        gpios = <&gpio0 0 0>;
                        linux,code = <0x211>;
                };
+
                reset {
                        label = "reset";
                        gpios = <&gpio0 12 0>;
@@ -106,3 +74,38 @@
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartlite", "mdio";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&factory 0x4>;
+
+       port@0 {
+               mediatek,fixed-link = <1000 1 1 1>;
+       };
+
+       mdio-bus {
+               status = "okay";
+
+               phy0: ethernet-phy@0 {
+                       phy-mode = "mii";
+                       reg = <0>;
+               };
+       };
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};