ramips: fix pinctrl regression

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

diff --git a/target/linux/ramips/dts/RT-G32-B1.dts b/target/linux/ramips/dts/RT-G32-B1.dts
index 396e683dfb644a3bb99e92a3acdb8f4c7a91a4e2..ab8e3fdad3c12e921adc0e3c50a0e14931efa875 100644 (file)
--- a/target/linux/ramips/dts/RT-G32-B1.dts
+++ b/target/linux/ramips/dts/RT-G32-B1.dts
@@ -1,79 +1,23 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
 
 / {
        compatible = "RT-G32-B1", "ralink,rt3050-soc";
        model = "Asus RT-G32 B1";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "mx25l3205d";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "devdata";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               devconf: partition@40000 {
-                                       label = "devconf";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&devconf 0x4>;
-       };
-
-       esw@10110000 {
-               ralink,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&devconf 0>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                reset {
                        label = "reset";
                        gpios = <&gpio0 10 1>;
                        linux,code = <0x198>;
                };
+
                wps {
                        label = "wps";
                        gpios = <&gpio0 0 1>;
@@ -81,3 +25,60 @@
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               linux,modalias = "m25p80", "mx25l3205d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "devdata";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               devconf: partition@40000 {
+                       label = "devconf";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&devconf 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&devconf 0>;
+};