ramips: specify "firmware" partition format

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

diff --git a/target/linux/ramips/dts/M4-8M.dts b/target/linux/ramips/dts/M4-8M.dts
index 65a3972d7d3743f4031a63b9199632bce48c5098..b947a36d08aa1f9eacf8452064b013516132270b 100644 (file)
--- a/target/linux/ramips/dts/M4-8M.dts
+++ b/target/linux/ramips/dts/M4-8M.dts
@@ -1,98 +1,48 @@
 /dts-v1/;
 
-#include "rt5350.dtsi"
-
-#include <dt-bindings/input/input.h>
+#include "M4.dtsi"
 
 / {
-       compatible = "M4", "ralink,rt5350-soc";
+       compatible = "poray,m4-8m", "poray,m4", "ralink,rt5350-soc";
        model = "Poray M4 (8M)";
-
-       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>;
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 10 1>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
 };
 
 &spi0 {
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                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 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x7b0000>;
+                       };
                };
        };
 };
-
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "jtag", "uartf";
-                       ralink,function = "gpio";
-               };
-       };
-};
-
-&ethernet {
-       mtd-mac-address = <&factory 0x4>;
-};
-
-&esw {
-       mediatek,portmap = <0x2f>;
-       mediatek,led_polarity = <1>;
-};
-
-&wmac {
-       ralink,mtd-eeprom = <&factory 0>;
-       ralink,led-polarity = <1>;
-};
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};