X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fdts%2Far9331_embeddedwireless_dorin.dts;h=614c31e1e7d382349a345497dadb677dac72d1eb;hp=eff3b091ecc301ad45034f7f9feaf94bd9edcac2;hb=HEAD;hpb=dc1268cb11d827f1868d6ef96e3d289431165c0e

diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index eff3b091ec..ee90617160 100644
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -1,44 +1,39 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar9331.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "ar9331.dtsi"
+#include <dt-bindings/leds/common.h>
 
 / {
 	model = "Embedded Wireless Dorin";
 	compatible = "embeddedwireless,dorin", "qca,ar9331";
 
 	aliases {
-		serial0 = &uart;
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x4000000>;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	leds {
 		compatible = "gpio-leds";
 
-		status {
-			label = "dorin:green:status";
+		led_status: status {
+			function = LED_FUNCTION_STATUS;
+			color = <LED_COLOR_ID_GREEN>;
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
-			default-state = "off";
 		};
 	};
 
 	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <100>;
+		compatible = "gpio-keys";
 
 		wps {
 			label = "wps";
 			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		reset {
@@ -49,14 +44,6 @@
 	};
 };
 
-&uart {
-	status = "okay";
-};
-
-&gpio {
-	status = "okay";
-};
-
 &usb {
 	dr_mode = "host";
 	status = "okay";
@@ -67,14 +54,11 @@
 };
 
 &spi {
-	num-chipselects = <1>;
 	status = "okay";
 
-	spiflash {
-		#address-cells = <1>;
-		#size-cells = <1>;
+	flash@0 {
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <104000000>;
+		spi-max-frequency = <50000000>;
 		reg = <0>;
 
 		partitions {
@@ -94,14 +78,27 @@
 			};
 
 			partition@2 {
+				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x050000 0xfa0000>;
 			};
 
 			art: partition@3 {
-				label = "ART";
+				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_1002: macaddr@1002 {
+						compatible = "mac-base";
+						reg = <0x1002 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 		};
 	};
@@ -110,14 +107,8 @@
 &eth1 {
 	status = "okay";
 
-	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <0x40>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-
+	nvmem-cells = <&macaddr_art_1002 0x400000>;
+	nvmem-cell-names = "mac-address";
 };
 
 &mdio1 {
@@ -126,6 +117,6 @@
 
 &wmac {
 	status = "okay";
+
 	mtd-cal-data = <&art 0x1000>;
-	mtd-mac-address = <&art 0x1002>;
 };