X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Frt5350_zorlik_zl5900v2.dts;h=4ff2d57f72966da93bb1fe8869ba824b2477055c;hb=HEAD;hp=d5d0ca3728dc60725606e7055984018fb82b86fe;hpb=3b0264eddbc94f43a015a965b9eb3e12cfce0655;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
index d5d0ca3728..4ff2d57f72 100644
--- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
+++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt5350.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,12 +18,12 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "zl5900v2:green:lan";
+			label = "green:lan";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_power: power {
-			label = "zl5900v2:blue:power";
+			label = "blue:power";
 			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
 		};
 	};
@@ -45,7 +43,7 @@
 &spi0 {
 	status = "okay";
 
-	m25p80@0 {
+	flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
@@ -82,24 +80,32 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		groups = "jtag", "uartf";
+		function = "gpio";
 	};
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x4>;
+	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cell-names = "mac-address";
 };
 
 &esw {
-	mediatek,portmap = <0>;
 	mediatek,portdisable = <0x2f>;
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&factory 0>;
+	ralink,mtd-eeprom = <&factory 0x0>;
+};
+
+&factory {
+	compatible = "nvmem-cells";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	macaddr_factory_4: macaddr@4 {
+		reg = <0x4 0x6>;
+	};
 };