ralink: set the mac addr via the dts file

Signed-off-by: John Crispin <[email protected]>

SVN-Revision: 38902

target/linux/ramips/base-files/etc/uci-defaults/02_network

@@ -163,64 +163,30 @@ ramips_setup_macs()
 	local wan_mac=""
 
 	case $board in
-	all0256n | \
-	all5002 | \
-	dir-615-h1)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		;;
-	3g-6200n | \
-	3g300m | \
-	w150m | \
-	air3gii | \
-	argus-atp52b | \
-	bc2 | \
-	br6425 | \
-	broadway | \
-	dir-620-d1 | \
-	f5d8235-v1 | \
-	ip2202 | \
-	mpr-a1 | \
-	mpr-a2 | \
-	dir-300-b7 | \
-	dir-320-b1 | \
-	mzk-w300nh2 | \
-	nw718 | \
-	psr-680w | \
-	rt-n15 | \
-	sl-r7205 | \
-	wmr300 | \
-	wl-351)
-		lan_mac=$(mtd_get_mac_binary factory 4)
+	*)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
-	asl26555)
-		lan_mac=$(mtd_get_mac_binary devdata 16388)
-		;;
-
 	w306r-v20)
-		lan_mac=$(mtd_get_mac_binary factory 4)
 		wan_mac=$(macaddr_add "$lan_mac" 5)
 		;;
 
-	rt-n13u | \
-	hg255d	| \
-	fonera20n | \
-	dir-810l)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
+	tew-691gr)
+		wan_mac=$(macaddr_add "$lan_mac" 3)
 		;;
 
-	dir-300-b1 |\
-	dir-300-b2 |\
-	dir-600-b1 |\
-	dir-610-a1)
-		lan_mac=$(mtd_get_mac_binary devdata 16388)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
+	tew-692gr)
+		wan_mac=$(macaddr_add "$lan_mac" 4)
+		;;
+
+	m3 |\
+	m4 |\
+	x5 |\
+	x8)
+		lan_mac=$(macaddr_add "$lan_mac" -1)
 		;;
 
 	dir-620-a1)
-		lan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
@@ -230,57 +196,20 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_ascii nvram wanmac)
 		;;
 
-	esr-9753 | \
-	ur-326n4g | \
-	ur-336un)
-		lan_mac=$(mtd_get_mac_binary devdata 16388)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
-		;;
-
-	m3 |\
-	m4 |\
-	x5 |\
-	x8)
-		lan_mac=$(mtd_get_mac_binary factory 4)
-		lan_mac=$(macaddr_add "$lan_mac" -1)
-		;;
-
 	nbg-419n | \
 	wcr-150gn)
-                lan_mac=$(mtd_get_mac_binary factory 4)
                 wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 
-	omni-emb-hpm)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		;;
-
-	f5d8235-v2)
-		lan_mac=$(mtd_get_mac_binary "u-boot" 262148)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
-		;;
-
 	rt-n56u)
-		lan_mac=$(mtd_get_mac_binary factory 4)
 		wan_mac=$(mtd_get_mac_binary factory 32772)
 		;;
 
-	tew-691gr)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		wan_mac=$(macaddr_add "$lan_mac" 3)
-		;;
-
-	tew-692gr)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		wan_mac=$(macaddr_add "$lan_mac" 4)
-		;;
-
 	all0239-3g | \
 	carambola | \
 	freestation5 | \
 	w502u | \
 	wnce2001)
-		lan_mac=$(mtd_get_mac_binary factory 40)
 		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
 
@@ -289,11 +218,6 @@ ramips_setup_macs()
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
-	d105 | \
-	wli-tx4-ag300n)
-		lan_mac=$(mtd_get_mac_binary factory 4)
-		;;
-
 	esac
 
 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac

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

@@ -54,6 +54,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -97,6 +97,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/AIR3GII.dts

@@ -56,6 +56,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		status = "okay";
 		ralink,portmap = <0x3e>;

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

@@ -56,6 +56,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3f>;
 	};

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

@@ -56,6 +56,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3f>;
 	};

target/linux/ramips/dts/ALL5002.dts

@@ -56,6 +56,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3f>;
 	};

target/linux/ramips/dts/ARGUS_ATP52B.dts

@@ -75,6 +75,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};

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

@@ -68,6 +68,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x1e>;
 	};

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

@@ -26,8 +26,8 @@
 					reg = <0x0 0x30000>;
 					read-only;
 				};
-				partition@30000 {
-					label = "devdata";
+				factory: partition@30000 {
+					label = "factory";
 					reg = <0x30000 0x10000>;
 					read-only;
 				};
@@ -63,6 +63,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x1e>;
 	};

target/linux/ramips/dts/BC2.dts

@@ -68,6 +68,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -25,6 +25,10 @@
 		#size-cells = <1>;
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/BROADWAY.dts

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};

target/linux/ramips/dts/CARAMBOLA.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3f>;
 	};

target/linux/ramips/dts/D105.dts

@@ -72,6 +72,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
         esw@10110000 {
                 ralink,portmap = <0x2f>;
                 ralink,led_polarity = <0x17>;

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

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 		ralink,led_polarity = <0x17>;

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		status = "okay";
 		ralink,portmap = <0x2f>;

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

@@ -60,6 +60,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -60,6 +60,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/DIR-810L.dts

@@ -77,6 +77,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	gsw@10110000 {
 		ralink,port4 = "ephy";
 

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

@@ -77,6 +77,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};

target/linux/ramips/dts/F5D8235_V1.dts

@@ -55,6 +55,7 @@
 
 	ethernet@400000 {
 		status = "okay";
+		mtd-mac-address = <&factory 0x4>;
 
                 port@0 {
 			ralink,fixed-link = <1000 1 1 1>;

target/linux/ramips/dts/F5D8235_V2.dts

@@ -24,7 +24,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		partition@0 {
+		uboot: partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x50000>;
 			read-only;
@@ -46,6 +46,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&uboot 0x40004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3f>;
 	};

target/linux/ramips/dts/FONERA20N.dts

@@ -82,6 +82,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 

target/linux/ramips/dts/FREESTATION5.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x01>;
 	};

target/linux/ramips/dts/HG255D.dts

@@ -104,6 +104,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/IP2202.dts

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/M3.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 		ralink,led_polarity = <1>;

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

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 		ralink,led_polarity = <1>;

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

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 		ralink,led_polarity = <1>;

target/linux/ramips/dts/MPRA1.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/MPRA2.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -54,6 +54,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/NW718.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -60,6 +60,7 @@
 	ethernet@10100000 {
 		phy-handle = <&phy0>;
 		phy-mode = "rgmii";
+		mtd-mac-address = <&factory 0x28>;
 
 		mdio-bus {
 			status = "okay";

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

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};

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

@@ -82,6 +82,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -53,6 +53,7 @@
 
 	ethernet@400000 {
 		status = "okay";
+		mtd-mac-address = <&factory 0x4>;
 
                 port@0 {
 			ralink,fixed-link = <1000 1 1 1>;

target/linux/ramips/dts/RTN56U.dts

@@ -22,7 +22,8 @@
 	};
 
 	ethernet@10100000 {
-                port@0 {
+       		mtd-mac-address = <&factory 0x4>;
+		port@0 {
 			ralink,fixed-link = <1000 1 1 1>;
 		};
 	};

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};

target/linux/ramips/dts/TEW-691GR.dts

@@ -22,6 +22,7 @@
 	};
 
 	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
 		port@0 {
 			phy-handle = <&phy0>;
 			phy-mode = "rgmii";

target/linux/ramips/dts/TEW-692GR.dts

@@ -23,6 +23,7 @@
 
 	ethernet@10100000 {
 		status = "okay";
+		mtd-mac-address = <&factory 0x28>;
 		port@0 {
 			phy-handle = <&phy0>;
 			phy-mode = "rgmii";

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -25,6 +25,10 @@
 		#size-cells = <1>;
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4004>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/W150M.dts

@@ -93,6 +93,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

target/linux/ramips/dts/W306R_V20.dts

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};

target/linux/ramips/dts/W502U.dts

@@ -1,3 +1,7 @@
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 /dts-v1/;
 
 /include/ "rt3050.dtsi"
@@ -52,6 +56,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};

target/linux/ramips/dts/WCR150GN.dts

@@ -77,6 +77,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};

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

@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3f>;
 		ralink,fct2 = <0x0002500c>;

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

@@ -52,6 +52,7 @@
 
 	ethernet@400000 {
 		status = "okay";
+		mtd-mac-address = <&factory 0x4>;
 
                 port@0 {
 			ralink,fixed-link = <1000 1 1 1>;

target/linux/ramips/dts/WMR300.dts

@@ -49,6 +49,7 @@
 	};
 
 	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
 		ralink,port-map = "wllll";
 	};
 

target/linux/ramips/dts/WNCE2001.dts

@@ -73,6 +73,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		power-green {

target/linux/ramips/dts/X5.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 		ralink,led_polarity = <1>;

target/linux/ramips/dts/X8.dts

@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 		ralink,led_polarity = <1>;