ramips: remove model name from LED labels

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / rt3050_dlink_dir-615-d.dts

diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
index 16018ff1f0815c494c02d4a35a831d457522842b..e84c9d9cb78a6713e53eed2f8d4381880f1ab67f 100644 (file)
--- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -17,7 +15,7 @@
                label-mac-device = &wmac;
        };
 
-       cfi@1f000000 {
+       flash@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
@@ -74,29 +72,29 @@
        leds {
                compatible = "gpio-leds";
 
-               status {
-                       label = "dir-615-d:amber:status";
+               status_amber {
+                       label = "amber:status";
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
-               led_status_green: status2 {
-                       label = "dir-615-d:green:status";
+               led_status_green: status_green {
+                       label = "green:status";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               wan {
-                       label = "dir-615-d:amber:wan";
+               wan_amber {
+                       label = "amber:wan";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
 
-               wan2 {
-                       label = "dir-615-d:green:wan";
+               wan_green {
+                       label = "green:wan";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "dir-615-d:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
@@ -110,13 +108,9 @@
        ralink,mtd-eeprom = <&devdata 0x4000>;
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+               function = "gpio";
        };
 };
-
-