ramips: convert mtd-mac-address to nvmem implementation

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7621_gnubee_gb-pc2.dts

diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
index bd3411b6142a03ec5e2006f9a23d0ea1507c45d9..a3ef3a01043caa81647219908de70a3908742d07 100644 (file)
--- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
+++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,16 +14,12 @@
                led-upgrade = &led_status;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        keys {
                compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -34,33 +28,33 @@
                compatible = "gpio-leds";
 
                system {
-                       label = "gb-pc2:green:system";
-                       gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+                       label = "green:system";
+                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_status: status {
-                       label = "gb-pc2:green:status";
-                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+                       label = "green:status";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "gb-pc2:green:lan1";
-                       gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+                       label = "green:lan1";
+                       gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "gb-pc2:green:lan2";
-                       gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+                       label = "green:lan2";
+                       gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
                };
 
                lan3-yellow {
-                       label = "gb-pc2:yellow:lan3";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       label = "yellow:lan3";
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan3-green {
-                       label = "gb-pc2:green:lan3";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                       label = "green:lan3";
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -72,10 +66,11 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <80000000>;
+               broken-flash-reset;
                m25p,fast-read;
 
                partitions {
@@ -114,15 +109,38 @@
        status = "okay";
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0xe000>;
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "jtag", "rgmii2", "uart3", "wdt";
-                       ralink,function = "gpio";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan1";
                };
+
+               port@4 {
+                       status = "okay";
+                       label = "lan2";
+               };
+       };
+};
+
+&state_default {
+       gpio {
+               groups = "jtag", "rgmii2", "uart3", "wdt";
+               function = "gpio";
+       };
+};
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
        };
 };