ramips: move partitions into partition table node

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / LINKIT7688.dts

diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index 210d4d0b8d102bd0aeba3bffc96f9154375d9c72..600f1b46a0b083d3e25c1323ac8ac405f53eb059 100644 (file)
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/LINKIT7688.dts
@@ -2,12 +2,17 @@
 
 #include "mt7628an.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,linkit", "mediatek,mt7628an-soc";
+       compatible = "mediatek,linkit-smart-7688", "mediatek,mt7628an-soc";
        model = "MediaTek LinkIt Smart 7688";
 
+       aliases {
+               led-status = &led_wifi;
+       };
+
        chosen {
                bootargs = "console=ttyS2,57600";
        };
@@ -30,33 +35,22 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               wifi {
-                       label = "mediatek:orange:wifi";
-                       gpios = <&wgpio 0 0>;
-                       default-state = "on";
+               led_wifi: wifi {
+                       label = "linkit-smart-7688:orange:wifi";
+                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
                };
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                wps {
                        label = "reset";
-                       gpios = <&gpio1 6 1>;
+                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
-
-       wgpio: gpio-wifi {
-               compatible = "mediatek,gpio-wifi";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
 };
 
 &pinctrl {
@@ -66,11 +60,6 @@
                        ralink,function = "gpio";
                };
 
-               perst {
-                       ralink,group = "perst";
-                       ralink,function = "gpio";
-               };
-
                refclk {
                        ralink,group = "refclk";
                        ralink,function = "gpio";
@@ -86,14 +75,9 @@
                        ralink,function = "gpio";
                };
 
-               wled_kn {
-                       ralink,group = "wled_kn";
-                       ralink,function = "gpio";
-               };
-
                wled_an {
                        ralink,group = "wled_an";
-                       ralink,function = "wled_an";
+                       ralink,function = "gpio";
                };
 
                wdt {
@@ -114,34 +98,37 @@
        pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80", "mx25l25635e";
                spi-max-frequency = <40000000>;
                m25p,chunked-io = <31>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x10000>;
-               };
-
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
-
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x1fb0000>;
+               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>;
+                       };
+
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x1fb0000>;
+                       };
                };
        };