X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7620a_hiwifi_hc5861.dts;h=73f1a4079ad0bc4fd99736c0835bc7f91f1597f2;hp=8951044f6391477594ee5469e35aac8eeb8c2d55;hb=HEAD;hpb=d7a28e8ed2120d1ca34511401246744c4375765f

diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
index 8951044f63..3f3ed3313f 100644
--- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620a_hiwifi_hc5x61.dtsi"
 
 / {
@@ -17,29 +15,29 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "hc5861:blue:system";
+			label = "blue:system";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "hc5861:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		internet {
-			label = "hc5861:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "hc5861:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		turbo {
-			label = "hc5861:blue:turbo";
+			label = "blue:turbo";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -72,11 +70,12 @@
 
 &ethernet {
 	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii1_pins &mdio_pins>;
+	pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
 
-	mtd-mac-address = <&factory 0x4>;
+	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cell-names = "mac-address";
 
-	mediatek,portmap = "wllll";
+	mediatek,portmap = "llllw";
 
 	port@5 {
 		status = "okay";
@@ -94,6 +93,10 @@
 	};
 };
 
+&gsw {
+	mediatek,ephy-base = /bits/ 8 <12>;
+};
+
 &pcie {
 	status = "okay";
 };
@@ -102,7 +105,14 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
+
+&wmac {
+	pinctrl-names = "default", "pa_gpio";
+	pinctrl-0 = <&pa_pins>;
+	pinctrl-1 = <&pa_gpio_pins>;
+};