ramips: fix pinctrl regression

[openwrt/openwrt.git] / target / linux / ramips / dts / SAP-G3200U3.dts

diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index a3ac8fd434c709883a129b9e67bea28dcdda0296..d6f2f3057668ce1d45c757e5b0ad73fe0ddb7eca 100644 (file)
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -15,76 +15,6 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       palmbus@1E000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "mx25l6405d";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "en25q64";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x1000>;
-                                       read-only;
-                               };
-
-                               partition@31000 {
-                                       label = "config";
-                                       reg = <0x31000 0xf000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pcie@1e140000 {
-               status = "okay";
-
-               pcie0 {
-                       mt76@0,0 {
-                               reg = <0x0000 0 0 0 0>;
-                               device_type = "pci";
-                               mediatek,mtd-eeprom = <&factory 0x8000>;
-                               mediatek,2ghz = <0>;
-                       };
-               };
-
-               pcie1 {
-                       mt76@1,0 {
-                               reg = <0x0000 0 0 0 0>;
-                               device_type = "pci";
-                               mediatek,mtd-eeprom = <&factory 0x0000>;
-                               mediatek,5ghz = <0>;
-                       };
-               };
-       };
-
-       ethernet@1e100000 {
-               mtd-mac-address = <&factory 0xe006>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
@@ -112,13 +42,81 @@
                        linux,code = <0xf7>;
                };
        };
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               linux,modalias = "m25p80", "en25q64";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x1000>;
+                       read-only;
+               };
+
+               partition@31000 {
+                       label = "config";
+                       reg = <0x31000 0xf000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&pcie {
+       status = "okay";
+
+       pcie0 {
+               mt76@0,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       device_type = "pci";
+                       mediatek,mtd-eeprom = <&factory 0x8000>;
+                       mediatek,2ghz = <0>;
+               };
+       };
+
+       pcie1 {
+               mt76@1,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       device_type = "pci";
+                       mediatek,mtd-eeprom = <&factory 0x0000>;
+                       mediatek,5ghz = <0>;
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0xe006>;
+};
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "uart3", "jtag";
-                               ralink,function = "gpio";
-                       };
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "uart3", "jtag";
+                       ralink,function = "gpio";
                };
        };
 };