ramips: mt7620a: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / mt7620a_dlink_dwr-118-a2.dts

diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
index d795c06b509c9b380e8cea643eb3c5e3d22291a0..990fa298f284a867e8d0d78c7494aa87f1157903 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        compatible = "dlink,dwr-118-a2", "ralink,mt7620a-soc";
@@ -34,27 +33,27 @@
                compatible = "gpio-leds";
 
                wan {
-                       label = "dwr-118-a2:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
                led_internet: internet {
-                       label = "dwr-118-a2:green:internet";
+                       label = "green:internet";
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "dwr-118-a2:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "dwr-118-a2:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "dwr-118-a2:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
@@ -105,7 +104,9 @@
                        };
 
                        partition@10000 {
-                               compatible = "amit,jimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,ih-magic = <IH_MAGIC_OKLI>;
+                               openwrt,offset = <0x10000>;
                                label = "firmware";
                                reg = <0x10000 0xfe0000>;
                        };
@@ -114,6 +115,16 @@
                                label = "config";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_e4a8: macaddr@e4a8 {
+                                               reg = <0xe4a8 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -142,8 +153,9 @@
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               mtd-mac-address = <&config 0xe4a8>;
-               mtd-mac-address-increment = <(2)>;
+               nvmem-cells = <&macaddr_config_e4a8>;
+               nvmem-cell-names = "mac-address";
+               mac-address-increment = <(2)>;
 
                led {
                        led-sources = <2>;
@@ -153,11 +165,11 @@
 };
 
 &ethernet {
-       status = "okay";
-       mediatek,portmap = "wllll";
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &mdio_pins>;
 
+       mediatek,portmap = "wllll";
+
        port@4 {
                status = "okay";
                phy-handle = <&phy0>;
@@ -175,6 +187,6 @@
 };
 
 &gsw {
-       mediatek,port4 = "gmac";
-       mediatek,ephy-base-address = /bits/ 16 < 2 >;
+       mediatek,port4-gmac;
+       mediatek,ephy-base = /bits/ 8 <2>;
 };