ramips: convert to new LED color/function format where possible

[openwrt/staging/jow.git] / target / linux / ramips / dts / rt3352_dlink_dir-620-d1.dts

diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
index c85f72d01959b93f9d3e79e729e442813628fe3f..c9f71f157da4afb99212fdf4747fb862b7cf5b1c 100644 (file)
--- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
+++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt3352.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "dlink,dir-620-d1", "ralink,rt3352-soc";
@@ -20,12 +19,13 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "dir-620-d1:green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
-                       label = "dir-620-d1:green:wifi";
+                       label = "green:wifi";
                        gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -45,7 +45,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -71,6 +71,20 @@
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -84,13 +98,14 @@
 
 &state_default {
        gpio {
-               ralink,group = "i2c", "jtag", "uartf";
-               ralink,function = "gpio";
+               groups = "i2c", "jtag", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii_pins &mdio_pins>;
 };
@@ -100,7 +115,8 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ehci {