ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / GB-PC2.dts

diff --git a/target/linux/ramips/dts/GB-PC2.dts b/target/linux/ramips/dts/GB-PC2.dts
index f31ac2b843454b9d4b9436c20a90ef6d02a62f70..33db903c7296d88ce2ef387cdced2a0f3cead45f 100644 (file)
--- a/target/linux/ramips/dts/GB-PC2.dts
+++ b/target/linux/ramips/dts/GB-PC2.dts
@@ -9,6 +9,13 @@
        compatible = "gnubee,gb-pc2", "mediatek,mt7621-soc";
        model = "GB-PC2";
 
+       aliases {
+               led-boot = &led_status;
+               led-failsafe = &led_status;
+               led-running = &led_status;
+               led-upgrade = &led_status;
+       };
+
        memory@0 {
                device_type = "memory";
                reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
@@ -18,16 +25,8 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       palmbus: palmbus@1E000000 {
-               i2c@900 {
-                       status = "okay";
-               };
-       };
-
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -37,7 +36,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                system {
@@ -45,31 +44,30 @@
                        gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
                };
 
-               status {
+               led_status: status {
                        label = "gb-pc2:green:status";
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
-               lan {
-                       label = "gb-pc2:green:lan";
+               lan1 {
+                       label = "gb-pc2:green:lan1";
                        gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
                };
 
-               wan {
-                       label = "gb-pc2:green:wan";
+               lan2 {
+                       label = "gb-pc2:green:lan2";
                        gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
                };
 
-               eth1-y {
-                       label = "gb-pc2:yellow:eth1-y";
+               lan3-yellow {
+                       label = "gb-pc2:yellow:lan3";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
 
-               eth1-g {
-                       label = "gb-pc2:green:eth1-g";
+               lan3-green {
+                       label = "gb-pc2:green:lan3";
                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
                };
-
        };
 };
 
@@ -81,43 +79,43 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
                m25p,chunked-io = <32>;
 
-               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 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>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x1fb0000>;
+                       };
                };
        };
 };
 
-&cpuclock {
-                       compatible = "fixed-clock";
-                       clock-frequency = <900000000>;
-};
-
 &pcie {
        status = "okay";
 };
@@ -129,7 +127,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                gpio {
-                       ralink,group = "uart3";
+                       ralink,group = "jtag", "rgmii2", "uart3", "wdt";
                        ralink,function = "gpio";
                };
        };