7 files changed, 26 insertions, 33 deletions
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 4c8beac066..b44bae90bb 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -43,25 +43,14 @@ board=$(ramips_board_name)
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
 	case $board in
-	*)
-		rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
-		;;
-	esac
-	;;
-
-"rt2x00pci_1_0.eeprom")
-	case $board in
-	cy-swr1100)
-		rt2x00_eeprom_extract "factory" 8192 512
-		;;
-	br-6475nd | rt-n56u | whr-600d | whr-1166d)
-		rt2x00_eeprom_extract "factory" 32768 512
-		;;
 	tiny-ac)
 		wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
 		rt2x00_eeprom_extract "factory" 0 512
 		rt2x00_eeprom_set_macaddr $wifi_mac
 		;;
+	*)
+		rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
+		;;
 	esac
 	;;
 esac
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index 87b048a841..2ab2cba894 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -157,11 +157,11 @@
 		pci-bridge@1 {
 			status = "okay";
 
-			wmac@0,0 {
+			wifi@0,0 {
+				compatible = "pci0,0";
+				reg = <0x10000 0 0 0 0>;
 				ralink,5ghz = <0>;
-				compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-				reg = < 0x10000 0 0 0 0 >;
-				ralink,eeprom = "rt2x00pci_1_0.eeprom";
+				ralink,mtd-eeprom = <&factory 0x8000>;
 			};
 		};
 	};
diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index 031d8f0052..95827d5017 100644
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -125,11 +125,11 @@
 		pci-bridge@1 {
 			status = "okay";
 
-			wmac@0,0 {
+			wifi@0,0 {
+				compatible = "pci0,0";
+				reg = <0x10000 0 0 0 0>;
 				ralink,5ghz = <0>;
-				compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-				reg = < 0x10000 0 0 0 0 >;
-				ralink,eeprom = "rt2x00pci_1_0.eeprom";
+				ralink,mtd-eeprom = <&factory 0x2000>;
 			};
 		};
 	};
diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/RT-N56U.dts
index d3a1f1bbfb..fea73e27e7 100644
--- a/target/linux/ramips/dts/RT-N56U.dts
+++ b/target/linux/ramips/dts/RT-N56U.dts
@@ -125,10 +125,10 @@
 		pci-bridge@1 {
 			status = "okay";
 
-			wmac@0,0 {
-				compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-				reg = < 0x10000 0 0 0 0 >;
-				ralink,eeprom = "rt2x00pci_1_0.eeprom";
+			wifi@1814,3091 {
+				compatible = "pci1814,3091";
+				reg = <0x10000 0 0 0 0>;
+				ralink,mtd-eeprom = <&factory 0x8000>;
 			};
 		};
 	};
diff --git a/target/linux/ramips/dts/TINY-AC.dts b/target/linux/ramips/dts/TINY-AC.dts
index 6a21247767..81f1adee87 100644
--- a/target/linux/ramips/dts/TINY-AC.dts
+++ b/target/linux/ramips/dts/TINY-AC.dts
@@ -145,10 +145,6 @@
 	mediatek,mt7530 = <1>;
 };
 
-&wmac {
-	ralink,eeprom = "rt2x00pci_1_0.eeprom";
-};
-
 &pcie {
 	status = "okay";
 };
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts
index 0c0f62728c..fd2e451c37 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/WHR-1166D.dts
@@ -160,10 +160,10 @@
 	status = "okay";
 
 	pcie-bridge {
-		mt76@0,0 {
+		wifi@0,0 {
+			compatible = "pci0,0";
 			reg = <0x0000 0 0 0 0>;
-			device_type = "pci";
-			mediatek,mtd-eeprom = <&factory 32768>;
+			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index 7d26f32b97..c0633559b6 100644
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -145,4 +145,12 @@
 
 &pcie {
 	status = "okay";
+
+	pcie-bridge {
+		wifi@1814,3091 {
+			compatible = "pci1814,3091";
+			reg = <0x0000 0 0 0 0>;
+			mediatek,mtd-eeprom = <&factory 0x8000>;
+		};
+	};
 };