ramips: move partitions into partition table node

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / M4-4M.dts

diff --git a/target/linux/ramips/dts/M4-4M.dts b/target/linux/ramips/dts/M4-4M.dts
index 329148ed4434f6628e211ee529e11ff8771729b2..7db48ebfc794307b326f6bb191f9a6f53b148485 100644 (file)
--- a/target/linux/ramips/dts/M4-4M.dts
+++ b/target/linux/ramips/dts/M4-4M.dts
@@ -1,94 +1,47 @@
 /dts-v1/;
 
-#include "rt5350.dtsi"
+#include "M4.dtsi"
 
 / {
-       compatible = "M4", "ralink,rt5350-soc";
-       model = "Poray M4";
-
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "pm25lq032";
-                               spi-max-frequency = <10000000>;
+       compatible = "poray,m4-4m", "poray,m4", "ralink,rt5350-soc";
+       model = "Poray M4 (4M)";
+};
 
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
+&spi0 {
+       status = "okay";
 
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
+       m25p80@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <10000000>;
 
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
                        };
-               };
-       };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf";
-                               ralink,function = "gpio";
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
                        };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-               mediatek,led_polarity = <1>;
-       };
 
-       gpio-leds {
-               compatible = "gpio-leds";
-
-               status {
-                       label = "m4:blue:status";
-                       gpios = <&gpio0 9 1>;
-               };
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <20>;
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
 
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x3b0000>;
+                       };
                };
        };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
 };