ramips: replace "mac-address-ascii" with "mac-base"

[openwrt/openwrt.git] / target / linux / ramips / dts / rt3052_tenda_3g300m.dts

diff --git a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
index 8189297494b3f352d05090c88db74de42140e492..4ae42d71a58103ed15ffed2a68b28ce5a36ecb4a 100644 (file)
--- a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
+++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,34 +18,34 @@
                compatible = "gpio-leds";
 
                3grouter {
-                       label = "3g300m:blue:3grouter";
+                       label = "blue:3grouter";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
                led_ap: ap {
-                       label = "3g300m:blue:ap";
+                       label = "blue:ap";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
 
                wisprouter {
-                       label = "3g300m:blue:wisprouter";
+                       label = "blue:wisprouter";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wirelessrouter {
-                       label = "3g300m:blue:wirelessrouter";
+                       label = "blue:wirelessrouter";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
 
                3g {
-                       label = "3g300m:blue:3g";
+                       label = "blue:3g";
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&otg_port1>;
                        linux,default-trigger = "usbport";
                };
 
                wpsreset {
-                       label = "3g300m:blue:wpsreset";
+                       label = "blue:wpsreset";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
        };
@@ -73,7 +71,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -112,13 +110,14 @@
 
 &state_default {
        gpio {
-               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-               ralink,function = "gpio";
+               groups = "i2c", "jtag", "rgmii", "mdio", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -126,9 +125,19 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       ralink,mtd-eeprom = <&factory 0x0>;
 };
 
 &otg {
        status = "okay";
 };
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_4: macaddr@4 {
+               reg = <0x4 0x6>;
+       };
+};