ramips: soc wmac eeprom cleanup

Move eeprom extraction from scripts to dts files.
Additionally there are few other changes like:
- whitespace fixes
- add partition labels where needed
- BR6524N board doesn't exist (lost in translation?)
- fix Edimax 3g-6200nl model
- add wmac eeprom to dts for Asus RT-N14U board

Compile tested all subtargets and their profiles.
Run tested on:
- Asus RT-N15
- Asus RT-N14U
- Buffalo WHR-600D
- Argus ATP52B
- Sparklan WCR-150GN

Few problems noted:
- many boards didn't have wmac eeprom information defined at all
- several boards don't have any patitions defined (see FIXME comments in dts)

Signed-off-by: Roman Yeryomin <[email protected]>

SVN-Revision: 41680

target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom

@@ -31,112 +31,8 @@ board=$(ramips_board_name)
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
 	case $board in
-	asl26555 | \
-	dir-300-b1 | \
-	dir-600-b1 | \
-	dir-600-b2 | \
-	dir-610-a1 | \
-	dir-615-d)
-		rt2x00_eeprom_extract "devdata" 16384 512
-		;;
-
-	dap-1350)
-		rt2x00_eeprom_extract "devdata" 0 512
-		;;
-
-	rt-n10-plus | \
-	rt-g32-b1)
-		rt2x00_eeprom_extract "devconf" 0 512
-		;;
-
-	f5d8235-v1 | \
-	f5d8235-v2)
-		rt2x00_eeprom_extract "u-boot" 262144 512
-		;;
-
-	3g-6200n | \
-	3g-6200nl | \
-	3g300m | \
-	air3gii | \
-	all0239-3g | \
-	all0256n | \
-	all5002 | \
-	all5003 | \
-	argus-atp52b | \
-	awm002-evb | \
-	awapn2403 | \
-	bc2 | \
-	br6425 | \
-	br-6475nd | \
-	broadway | \
-	br6524n | \
-	carambola | \
-	cy-swr1100 | \
-	d105 | \
-	dcs-930 | \
-	dir-300-b7 | \
-	dir-320-b1 | \
-	dir-615-h1 | \
-	dir-620-a1 | \
-	dir-620-d1 | \
-	dir-645 | \
-	esr-9753 | \
-	f7c027 | \
-	fonera20n | \
-	rt-n13u | \
-	freestation5 | \
-	hlk-rm04 | \
-	hw550-3g | \
-	mofi3500-3gn | \
-	mpr-a1 | \
-	mpr-a2 | \
-	mzk-750dhp | \
-	pwh2004 | \
-	ncs601w | \
-	nbg-419n | \
-	nw718 | \
-	omni-emb | \
-	omni-emb-hpm | \
-	psr-680w | \
-	px4885 | \
-	rt-n15 | \
-	rt-n56u | \
-	rut5xx | \
-	sl-r7205 | \
-	v11st-fe | \
-	v22rw-2x2 | \
-	w306r-v20 | \
-	w150m | \
-	w502u | \
-	wcr-150gn | \
-	whr-g300n | \
-	whr-300hp2 | \
-	whr-600d | \
-	whr-1166d | \
-	wl-330n | \
-	wl-330n3g | \
-	wl-351 | \
-	wli-tx4-ag300n | \
-	wmr300 | \
-	wnce2001 | \
-	wr512-3gn | \
-	wr6202 | \
-	wr8305rt | \
-	wrtnode | \
-	mzk-w300nh2 | \
-	ur-326n4g | \
-	ur-336un | \
-	xdxrn502j | \
-	hg255d)
-		rt2x00_eeprom_extract "factory" 0 512
-		;;
-
-	wl341v3)
-		rt2x00_eeprom_extract "board-nvram" 64880 512
-		;;
-
 	*)
-		rt2x00_eeprom_die "board $board is not supported yet"
+		rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
 		;;
 	esac
 	;;

target/linux/ramips/base-files/lib/ramips.sh

@@ -58,9 +58,6 @@ ramips_board_detect() {
 	*"AsiaRF AWAPN2403")
 		name="awapn2403"
 		;;
-	*"BR6524N")
-		name="br6524n"
-		;;
 	*"Asus WL-330N")
 		name="wl-330n"
 		;;

target/linux/ramips/dts/3G-6200N.dts

@@ -62,6 +62,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power {

target/linux/ramips/dts/3G-6200NL.dts

@@ -3,8 +3,8 @@
 /include/ "rt3050.dtsi"
 
 / {
-	compatible = "3G-6200N", "ralink,rt3050-soc";
-	model = "Edimax 3g-6200n";
+	compatible = "3G-6200NL", "ralink,rt3050-soc";
+	model = "Edimax 3g-6200nl";
 
 	pinctrl {
 		state_default: pinctrl0 {
@@ -58,6 +58,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		wlan {

target/linux/ramips/dts/3G300M.dts

@@ -105,6 +105,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/AIR3GII.dts

@@ -64,6 +64,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		wlan {

target/linux/ramips/dts/ALL0239-3G.dts

@@ -57,6 +57,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		usb {

target/linux/ramips/dts/ALL0256N-4M.dts

@@ -64,6 +64,10 @@
 		ralink,portmap = <0x3f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		rssilow {

target/linux/ramips/dts/ALL0256N-8M.dts

@@ -64,6 +64,10 @@
 		ralink,portmap = <0x3f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		rssilow {

target/linux/ramips/dts/ALL5002.dts

@@ -64,6 +64,10 @@
 		ralink,portmap = <0x3f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	ehci@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/ALL5003.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x3f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	ehci@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/ARGUS_ATP52B.dts

@@ -83,6 +83,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/ASL26555-16M.dts

@@ -50,7 +50,7 @@
 					reg = <0xfe0000 0x10000>;
 					read-only;
 				};
-				partition@ff0000 {
+				devdata: partition@ff0000 {
 					label = "devdata";
 					reg = <0xff0000 0x10000>;
 					read-only;
@@ -76,6 +76,10 @@
 		ralink,portmap = <0x1e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devdata 0x4000>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/ASL26555-8M.dts

@@ -71,6 +71,11 @@
 		ralink,portmap = <0x1e>;
 	};
 
+	/* devdata partition seems to be missing */
+/*	wmac@10180000 {
+		ralink,mtd-eeprom = <&devdata 0x4000>;
+	};
+*/
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/AWAPN2403.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		link {

target/linux/ramips/dts/AWM002-EVB-4M.dts

@@ -5,6 +5,10 @@
 / {
 	model = "AsiaRF AWM002 EVB";
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		tx {

target/linux/ramips/dts/AWM002-EVB-8M.dts

@@ -5,6 +5,10 @@
 / {
 	model = "AsiaRF AWM002 EVB";
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		tx {

target/linux/ramips/dts/BC2.dts

@@ -76,6 +76,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/BR-6425.dts

@@ -33,6 +33,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power {

target/linux/ramips/dts/BR-6475ND.dts

@@ -37,6 +37,10 @@
 		};
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pci@10140000 {
 		status = "okay";
 

target/linux/ramips/dts/BROADWAY.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		diskmounted {

target/linux/ramips/dts/CARAMBOLA.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x3f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/CY-SWR1100.dts

@@ -49,6 +49,7 @@
 
 	wmac@10180000 {
 		status = "okay";
+		ralink,mtd-eeprom = <&factory 0>;
 	};
 
 	ehci@101c0000 {

target/linux/ramips/dts/D105.dts

@@ -80,6 +80,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/DAP-1350.dts

@@ -34,7 +34,7 @@
 			read-only;
 		};
 
-		partition@30000 {
+		devdata: partition@30000 {
 			label = "devdata";
 			reg = <0x30000 0x10000>;
 			read-only;
@@ -62,6 +62,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devdata 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power {

target/linux/ramips/dts/DCS-930.dts

@@ -122,6 +122,10 @@
 		};
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/DIR-300-B1.dts

@@ -30,7 +30,7 @@
 			read-only;
 		};
 
-		partition@30000 {
+		devdata: partition@30000 {
 			label = "devdata";
 			reg = <0x30000 0x10000>;
 			read-only;
@@ -56,6 +56,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devdata 0x4000>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/DIR-300-B7.dts

@@ -92,9 +92,10 @@
                 };
         };
 
-        wmac@10180000 {
-                status = "okay";
+	wmac@10180000 {
+		status = "okay";
 		ralink,led-polarity = <1>;
-        };
+		ralink,mtd-eeprom = <&factory 0>;
+	};
 };
 

target/linux/ramips/dts/DIR-320-B1.dts

@@ -61,6 +61,10 @@
 		ralink,led_polarity = <0x17>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		status {

target/linux/ramips/dts/DIR-600-B1.dts

@@ -30,7 +30,7 @@
 			read-only;
 		};
 
-		partition@30000 {
+		devdata: partition@30000 {
 			label = "devdata";
 			reg = <0x30000 0x10000>;
 			read-only;
@@ -56,6 +56,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devdata 0x4000>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/DIR-600-B2.dts

@@ -30,7 +30,7 @@
 			read-only;
 		};
 
-		partition@30000 {
+		devdata: partition@30000 {
 			label = "devdata";
 			reg = <0x30000 0x10000>;
 			read-only;
@@ -52,6 +52,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devdata 0x4000>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/DIR-610-A1.dts

@@ -65,7 +65,7 @@
 	wmac@10180000 {
 		status = "okay";
 		ralink,led-polarity = <1>;
-		ralink,mtd-eeprom = <&devdata 16384>;
+		ralink,mtd-eeprom = <&devdata 0x4000>;
 	};
 
 	gpio-leds {

target/linux/ramips/dts/DIR-615-D.dts

@@ -30,7 +30,7 @@
 			read-only;
 		};
 
-		partition@30000 {
+		devdata: partition@30000 {
 			label = "devdata";
 			reg = <0x30000 0x10000>;
 			read-only;
@@ -52,6 +52,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devdata 0x4000>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/DIR-615-H1.dts

@@ -68,6 +68,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		status {

target/linux/ramips/dts/DIR-620-A1.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/DIR-620-D1.dts

@@ -68,6 +68,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		status {

target/linux/ramips/dts/DIR-645.dts

@@ -71,6 +71,7 @@
 
 	wmac@10180000 {
 		ralink,5ghz = <0>;
+		ralink,mtd-eeprom = <&factory 0>;
 	};
 
 	ehci@101c0000 {

target/linux/ramips/dts/ESR-9753.dts

@@ -84,4 +84,8 @@
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
+
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
 };

target/linux/ramips/dts/F5D8235_V1.dts

@@ -62,10 +62,12 @@
 		};
 	};
 
-	wmac@480000 {
+	/* FIXME: no u-boot partition and 0x40000@uboot is out of boundaries */
+/*	wmac@480000 {
 		status = "okay";
+		ralink,mtd-eeprom = <&u-boot 0x40000>;
 	};
-
+*/
 	rtl8367s {
 		compatible = "realtek,rtl8367s";
 		gpio-sda = <&gpio0 1 0>;

target/linux/ramips/dts/F5D8235_V2.dts

@@ -25,7 +25,7 @@
 		#size-cells = <1>;
 
 		uboot: partition@0 {
-			label = "u-boot";
+			label = "uboot";
 			reg = <0x0 0x50000>;
 			read-only;
 		};
@@ -54,6 +54,10 @@
 		ralink,portmap = <0x3f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&uboot 0x40000>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/F7C027.dts

@@ -68,6 +68,10 @@
 		};
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pinctrl {
 		state_default: pinctrl0 {
 			gpio {

target/linux/ramips/dts/FONERA20N.dts

@@ -116,6 +116,10 @@
 		};
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/FREESTATION5.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x01>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/HG255D.dts

@@ -112,6 +112,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/HW550-3G.dts

@@ -52,6 +52,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		usb {

target/linux/ramips/dts/MOFI3500-3GN.dts

@@ -96,6 +96,7 @@
 
 	wmac@10180000 {
 		status = "okay";
+		ralink,mtd-eeprom = <&factory 0>;
 	};
 
 	otg@101c0000 {

target/linux/ramips/dts/MPRA1.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	ehci@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/MPRA2.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	ehci@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/MZK-750DHP.dts

@@ -69,6 +69,10 @@
 		ralink,port4 = "ephy";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pcie@10140000 {
 		status = "okay";
 	};

target/linux/ramips/dts/MZK-W300NH2.dts

@@ -62,6 +62,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power {

target/linux/ramips/dts/NBG-419N.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power {

target/linux/ramips/dts/NCS601W.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	ehci@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/NW718.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		cpu {

target/linux/ramips/dts/OMNI-EMB-HPM.dts

@@ -71,6 +71,10 @@
 		};
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	ehci@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/OMNI-EMB.dts

@@ -76,6 +76,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/PSR-680W.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		wan {

target/linux/ramips/dts/PWH2004.dts

@@ -75,4 +75,8 @@
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};
+
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
 };

target/linux/ramips/dts/RT-G32-B1.dts

@@ -29,7 +29,7 @@
 					read-only;
 				};
 
-				factory: partition@40000 {
+				devconf: partition@40000 {
 					label = "devconf";
 					reg = <0x40000 0x10000>;
 					read-only;
@@ -53,13 +53,17 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4>;
+		mtd-mac-address = <&devconf 0x4>;
 	};
 
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devconf 0>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/RT-N10-PLUS.dts

@@ -27,7 +27,7 @@
 			read-only;
 		};
 
-		partition@40000 {
+		devconf: partition@40000 {
 			label = "devconf";
 			reg = <0x40000 0x10000>;
 			read-only;
@@ -43,6 +43,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&devconf 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		wps {

target/linux/ramips/dts/RT-N13U.dts

@@ -90,6 +90,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/RT-N14U.dts

@@ -66,6 +66,10 @@
 		ralink,port-map = "wllll";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pinctrl {
 		state_default: pinctrl0 {
 			default {

target/linux/ramips/dts/RT-N15.dts

@@ -76,6 +76,10 @@
 		gpio-sck = <&gpio0 2 0>;
 	};
 
+	wmac@480000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/RTN56U.dts

@@ -56,7 +56,7 @@
 	wmac@10180000 {
 		status = "okay";
 		ralink,2ghz = <0>;
-		ralink,eeprom = "soc_wmac.eeprom";
+		ralink,mtd-eeprom = <&factory 0>;
 	};
 
 	ehci@101c0000 {

target/linux/ramips/dts/RUT5XX.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		status {

target/linux/ramips/dts/SL-R7205.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		wifi {

target/linux/ramips/dts/UR-326N4G.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		3g {

target/linux/ramips/dts/UR-336UN.dts

@@ -25,14 +25,20 @@
 		#size-cells = <1>;
 	};
 
-	ethernet@10100000 {
+	/* FIXME: no partitions defined */
+/*	ethernet@10100000 {
 		mtd-mac-address = <&factory 0x4004>;
 	};
-
+*/
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};
 
+	/* FIXME: no partitions defined */
+/*	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+*/
 	gpio-leds {
 		compatible = "gpio-leds";
 		3g {

target/linux/ramips/dts/V11STFE.dts

@@ -24,6 +24,10 @@
 		status = "okay";
 	};
 
+	wmac@480000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pci@10140000 {
 		status = "okay";
 
@@ -54,7 +58,7 @@
 			read-only;
 		};
 
-		partition@40000 {
+		factory: partition@40000 {
 			reg = <0x00040000 0x00010000>;
 			label = "factory";
 			read-only;

target/linux/ramips/dts/V22RW-2X2.dts

@@ -52,6 +52,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		security {

target/linux/ramips/dts/W150M.dts

@@ -100,4 +100,8 @@
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};
+
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
 };

target/linux/ramips/dts/W306R_V20.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		sys {

target/linux/ramips/dts/W502U.dts

@@ -60,6 +60,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		usb {

target/linux/ramips/dts/WCR150GN.dts

@@ -85,6 +85,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/WHR-1166D.dts

@@ -73,6 +73,10 @@
 		ralink,port4 = "ephy";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pcie@10140000 {
 		status = "okay";
 	};

target/linux/ramips/dts/WHR-300HP2.dts

@@ -77,6 +77,10 @@
 		ralink,port4 = "ephy";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power {

target/linux/ramips/dts/WHR-600D.dts

@@ -74,6 +74,10 @@
 		ralink,port4 = "ephy";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pcie@10140000 {
 		status = "okay";
 	};

target/linux/ramips/dts/WHR-G300N.dts

@@ -29,6 +29,11 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	/* FIXME: no partitions defined */
+/*	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+*/
 	gpio-leds {
 		compatible = "gpio-leds";
 		diag {

target/linux/ramips/dts/WL-351.dts

@@ -64,6 +64,10 @@
 		ralink,fpa2 = <0x1f003fff>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/WL341V3.dts

@@ -21,7 +21,7 @@
 			read-only;
 		};
 
-		partition@20000 {
+		boardnvram: partition@20000 {
 			label = "board-nvram";
 			reg = <0x20000 0x10000>;
 			read-only;
@@ -52,6 +52,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&boardnvram 0xfd70>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		first {

target/linux/ramips/dts/WLI-TX4-AG300N.dts

@@ -59,6 +59,10 @@
 		};
 	};
 
+	wmac@480000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/ramips/dts/WL_330N.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		link {

target/linux/ramips/dts/WL_330N3G.dts

@@ -56,6 +56,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		3g {

target/linux/ramips/dts/WMR300.dts

@@ -53,6 +53,10 @@
 		ralink,port-map = "wllll";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pinctrl {
 		state_default: pinctrl0 {
 			default {

target/linux/ramips/dts/WNCE2001.dts

@@ -77,6 +77,10 @@
 		mtd-mac-address = <&factory 0x28>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power-green {

target/linux/ramips/dts/WR512-3GN-4M.dts

@@ -52,6 +52,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		3g {

target/linux/ramips/dts/WR512-3GN-8M.dts

@@ -52,6 +52,10 @@
 		ralink,portmap = <0x2f>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		3g {

target/linux/ramips/dts/WR6202.dts

@@ -85,6 +85,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	otg@101c0000 {
 		status = "okay";
 	};

target/linux/ramips/dts/WR8305RT.dts

@@ -64,6 +64,10 @@
 		ralink,port-map = "llllw";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pinctrl {
 		state_default: pinctrl0 {
 			ephy {

target/linux/ramips/dts/WRTNODE.dts

@@ -65,6 +65,10 @@
 		ralink,port-map = "wllll";
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	pinctrl {
 		state_default: pinctrl0 {
 			default {

target/linux/ramips/dts/XDXRN502J.dts

@@ -52,6 +52,10 @@
 		ralink,portmap = <0x3e>;
 	};
 
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&factory 0>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		wifi {