ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / MAC1200RV2.dts

diff --git a/target/linux/ramips/dts/MAC1200RV2.dts b/target/linux/ramips/dts/MAC1200RV2.dts
index 73ba493c5de76e705b568564ed2fe01b60f2e91f..339407d04c052b81f49930b1b1b7f807a511b27f 100644 (file)
--- a/target/linux/ramips/dts/MAC1200RV2.dts
+++ b/target/linux/ramips/dts/MAC1200RV2.dts
@@ -2,10 +2,20 @@
 
 #include "mt7628an.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "mercury,mac1200rv2", "mediatek,mt7628an-soc";
+       compatible = "mercury,mac1200r-v2", "mediatek,mt7628an-soc";
        model = "Mercury MAC1200R v2";
 
+       aliases {
+               led-boot = &led_status;
+               led-failsafe = &led_status;
+               led-running = &led_status;
+               led-upgrade = &led_status;
+       };
+
        chosen {
                bootargs = "console=ttyS0,57600";
        };
@@ -15,11 +25,11 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
-               status {
+               led_status: status {
                        label = "mac1200rv2:green:status";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -28,43 +38,48 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0 0>;
                spi-max-frequency = <10000000>;
                m25p,chunked-io = <32>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x1d800>;
-               };
-
-               factory: partition@0x1d800 {
-                       label = "factory_info";
-                       reg = <0x1d800 0x800>;
-                       read-only;
-               };
-
-               art: partition@0x1e000 {
-                       label = "art";
-                       reg = <0x1e000 0x2000>;
-                       read-only;
-               };
-
-               partition@20000 {
-                       label = "config";
-                       reg = <0x20000 0x10000>;
-               };
-
-               partition@30000 {
-                       label = "u-boot2";
-                       reg = <0x30000 0x10000>;
-               };
-
-               partition@40000 {
-                       label = "firmware";
-                       reg = <0x40000 0x7c0000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x1d800>;
+                       };
+
+                       factory: partition@1d800 {
+                               label = "factory_info";
+                               reg = <0x1d800 0x800>;
+                               read-only;
+                       };
+
+                       art: partition@1e000 {
+                               label = "art";
+                               reg = <0x1e000 0x2000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "config";
+                               reg = <0x20000 0x10000>;
+                       };
+
+                       partition@30000 {
+                               label = "u-boot2";
+                               reg = <0x30000 0x10000>;
+                       };
+
+                       partition@40000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x40000 0x7c0000>;
+                       };
                };
        };
 };
@@ -72,7 +87,7 @@
 &ethernet {
        pinctrl-names = "default";
        mtd-mac-address = <&factory 0xd>;
-       ralink,port-map = "llllw";
+       mediatek,portmap = "llllw";
 };
 
 &wmac {
@@ -82,12 +97,12 @@
 
 &pcie {
        status = "okay";
-       pcie-bridge {
-               mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
-                       mediatek,mtd-eeprom = <&art 0x1000>;
-                       ieee80211-freq-limit = <5000000 6000000>;
-               };
+};
+
+&pcie0 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&art 0x1000>;
+               ieee80211-freq-limit = <5000000 6000000>;
        };
 };