tools/quilt: update to 0.68

[openwrt/openwrt.git] / target / linux / ramips / dts / rt5350_dlink_dcs-930l-b1.dts

diff --git a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts
index c08a76d554ce083313fcea544978f43692c31191..254b8353a88886849061b6f983835e3753ea5d73 100644 (file)
--- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt5350.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "dlink,dcs-930l-b1", "ralink,rt5350-soc";
@@ -20,12 +19,14 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "dcs-930l-b1:red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "dcs-930l-b1:blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
                };
        };
@@ -51,7 +52,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -73,10 +74,24 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                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 {
@@ -90,13 +105,14 @@
 
 &state_default {
        gpio {
-               ralink,group = "i2c", "jtag", "uartf", "led";
-               ralink,function = "gpio";
+               groups = "i2c", "jtag", "uartf", "led";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -104,13 +120,6 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
-};
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };