X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7621_telco-electronics_x1.dts;h=4d8fa7f320d94aa023a91e3bebcdb31920a3ed47;hb=33951848257848d220f39410b8f949c788d8b5af;hp=abba2ea8b1cd4ae06089af8f58ea086e0b4acce6;hpb=a2c19f1d2f658367e6d62a6bdcfc72f12f23e43e;p=openwrt%2Fstaging%2Fhauke.git

diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
index abba2ea8b1..4d8fa7f320 100644
--- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
+++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -23,12 +21,11 @@
 	};
 
 	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
+		compatible = "gpio-keys";
 
 		reset {
 			label = "reset";
-			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 		};
 	};
@@ -37,48 +34,48 @@
 		compatible = "gpio-leds";
 
 		system_led: system {
-			label = "x1:green:system";
-			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
+			label = "green:system";
+			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_offline {
-			label = "x1:red:modem-offline";
-			gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+			label = "red:modem-offline";
+			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		modem_4g {
-			label = "x1:blue:modem-4g";
-			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+			label = "blue:modem-4g";
+			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_3g {
-			label = "x1:green:modem-3g";
-			gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+			label = "green:modem-3g";
+			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_rssi_lowest {
-			label = "x1:green:modem-rssi-lowest";
-			gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
+			label = "green:modem-rssi-lowest";
+			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_rssi_low {
-			label = "x1:green:modem-rssi-low";
-			gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+			label = "green:modem-rssi-low";
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_rssi_medium {
-			label = "x1:green:modem-rssi-medium";
-			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+			label = "green:modem-rssi-medium";
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_rssi_high {
-			label = "x1:green:modem-rssi-high";
-			gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
+			label = "green:modem-rssi-high";
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_rssi_highest {
-			label = "x1:green:modem-rssi-highest";
-			gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
+			label = "green:modem-rssi-highest";
+			gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
@@ -112,6 +109,26 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						compatible = "mac-base";
+						reg = <0xe006 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			firmware: partition@50000 {
@@ -123,45 +140,77 @@
 	};
 };
 
-&gpio0 {
-	status = "okay";
+&ethernet {
+	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
 };
 
-&ethernet {
-	mtd-mac-address = <&factory 0xe006>;
-	mediatek,portmap = "llllw";
+&gmac0 {
+	nvmem-cells = <&macaddr_factory_e006 0>;
+	nvmem-cell-names = "mac-address";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "uart2", "wdt", "rgmii2";
-			ralink,function = "gpio";
+&switch0 {
+	ports {
+		port@0 {
+			status = "okay";
+			label = "lan1";
+		};
+
+		port@1 {
+			status = "okay";
+			label = "lan2";
+		};
+
+		port@2 {
+			status = "okay";
+			label = "lan3";
+		};
+
+		port@3 {
+			status = "okay";
+			label = "lan4";
 		};
+
+		port@4 {
+			status = "okay";
+			label = "wan";
+			nvmem-cells = <&macaddr_factory_e006 1>;
+			nvmem-cell-names = "mac-address";
+		};
+	};
+};
+
+&state_default {
+	gpio {
+		groups = "wdt", "rgmii2";
+		function = "gpio";
 	};
 };
 
 &pcie {
 	status = "okay";
+};
 
-	pcie0 {
-		wifi@0,0 {
-			compatible = "pci14c3,7603";
-			reg = <0x0000 0 0 0 0>;
-			mediatek,mtd-eeprom = <&factory 0x0000>;
-			ieee80211-freq-limit = <2400000 2500000>;
-		};
+&pcie0 {
+	wifi@0,0 {
+		compatible = "pci14c3,7603";
+		reg = <0x0000 0 0 0 0>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
+		ieee80211-freq-limit = <2400000 2500000>;
 	};
+};
 
-	pcie1 {
-		wifi@0,0 {
-			compatible = "pci14c3,7662";
-			reg = <0x0000 0 0 0 0>;
-			mediatek,mtd-eeprom = <&factory 0x8000>;
-			ieee80211-freq-limit = <5000000 6000000>;
-			led {
-				led-sources = <2>;
-			};
+&pcie1 {
+	wifi@0,0 {
+		compatible = "pci14c3,7662";
+		reg = <0x0000 0 0 0 0>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
+		ieee80211-freq-limit = <5000000 6000000>;
+
+		led {
+			led-sources = <2>;
 		};
 	};
 };