ramips: convert mtd-mac-address to nvmem implementation

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / mt7621_lenovo_newifi-d1.dts

diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
index 2c180585c92700cba48ada2e173be5e4990318fb..ddd46befe650259f0a3fe80bed3e366f49c2e7c5 100644 (file)
--- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
+++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -14,11 +12,7 @@
                led-failsafe = &led_blue;
                led-running = &led_blue;
                led-upgrade = &led_blue;
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x10000000>;
+               label-mac-device = &gmac0;
        };
 
        chosen {
@@ -29,29 +23,28 @@
                compatible = "gpio-leds";
 
                status-red {
-                       label = "newifi-d1:red:status";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       label = "red:status";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                status-green {
-                       label = "newifi-d1:green:status";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       label = "green:status";
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_blue: status-blue {
-                       label = "newifi-d1:blue:status";
-                       gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+                       label = "blue:status";
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -63,13 +56,13 @@
                usb2power {
                        gpio-export,name = "usb2power";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
                };
 
                usb3power {
                        gpio-export,name = "usb3power";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
        };
 };
@@ -81,11 +74,11 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
-               compatible = "mx25l25635f", "jedec,spi-nor";
+       flash@0 {
+               compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <25000000>;
-               m25p,fast-read;
+               spi-max-frequency = <45000000>;
+               broken-flash-reset;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -138,15 +131,49 @@
        };
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0xe000>;
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c";
-                       ralink,function = "gpio";
+&switch0 {
+       ports {
+               port@1 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
+                       nvmem-cells = <&macaddr_factory_e006>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
+
+&state_default {
+       gpio {
+               groups = "jtag", "uart2";
+               function = "gpio";
+       };
+};
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
+
+       macaddr_factory_e006: macaddr@e006 {
+               reg = <0xe006 0x6>;
+       };
+};