ramips: soc wmac eeprom cleanup
authorJohn Crispin <john@openwrt.org>
Thu, 17 Jul 2014 10:55:31 +0000 (10:55 +0000)
committerJohn Crispin <john@openwrt.org>
Thu, 17 Jul 2014 10:55:31 +0000 (10:55 +0000)
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 <roman@advem.lv>
SVN-Revision: 41680

90 files changed:
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
target/linux/ramips/base-files/lib/ramips.sh
target/linux/ramips/dts/3G-6200N.dts
target/linux/ramips/dts/3G-6200NL.dts
target/linux/ramips/dts/3G300M.dts
target/linux/ramips/dts/AIR3GII.dts
target/linux/ramips/dts/ALL0239-3G.dts
target/linux/ramips/dts/ALL0256N-4M.dts
target/linux/ramips/dts/ALL0256N-8M.dts
target/linux/ramips/dts/ALL5002.dts
target/linux/ramips/dts/ALL5003.dts
target/linux/ramips/dts/ARGUS_ATP52B.dts
target/linux/ramips/dts/ASL26555-16M.dts
target/linux/ramips/dts/ASL26555-8M.dts
target/linux/ramips/dts/AWAPN2403.dts
target/linux/ramips/dts/AWM002-EVB-4M.dts
target/linux/ramips/dts/AWM002-EVB-8M.dts
target/linux/ramips/dts/BC2.dts
target/linux/ramips/dts/BR-6425.dts
target/linux/ramips/dts/BR-6475ND.dts
target/linux/ramips/dts/BROADWAY.dts
target/linux/ramips/dts/CARAMBOLA.dts
target/linux/ramips/dts/CY-SWR1100.dts
target/linux/ramips/dts/D105.dts
target/linux/ramips/dts/DAP-1350.dts
target/linux/ramips/dts/DCS-930.dts
target/linux/ramips/dts/DIR-300-B1.dts
target/linux/ramips/dts/DIR-300-B7.dts
target/linux/ramips/dts/DIR-320-B1.dts
target/linux/ramips/dts/DIR-600-B1.dts
target/linux/ramips/dts/DIR-600-B2.dts
target/linux/ramips/dts/DIR-610-A1.dts
target/linux/ramips/dts/DIR-615-D.dts
target/linux/ramips/dts/DIR-615-H1.dts
target/linux/ramips/dts/DIR-620-A1.dts
target/linux/ramips/dts/DIR-620-D1.dts
target/linux/ramips/dts/DIR-645.dts
target/linux/ramips/dts/ESR-9753.dts
target/linux/ramips/dts/F5D8235_V1.dts
target/linux/ramips/dts/F5D8235_V2.dts
target/linux/ramips/dts/F7C027.dts
target/linux/ramips/dts/FONERA20N.dts
target/linux/ramips/dts/FREESTATION5.dts
target/linux/ramips/dts/HG255D.dts
target/linux/ramips/dts/HW550-3G.dts
target/linux/ramips/dts/MOFI3500-3GN.dts
target/linux/ramips/dts/MPRA1.dts
target/linux/ramips/dts/MPRA2.dts
target/linux/ramips/dts/MZK-750DHP.dts
target/linux/ramips/dts/MZK-W300NH2.dts
target/linux/ramips/dts/NBG-419N.dts
target/linux/ramips/dts/NCS601W.dts
target/linux/ramips/dts/NW718.dts
target/linux/ramips/dts/OMNI-EMB-HPM.dts
target/linux/ramips/dts/OMNI-EMB.dts
target/linux/ramips/dts/PSR-680W.dts
target/linux/ramips/dts/PWH2004.dts
target/linux/ramips/dts/RT-G32-B1.dts
target/linux/ramips/dts/RT-N10-PLUS.dts
target/linux/ramips/dts/RT-N13U.dts
target/linux/ramips/dts/RT-N14U.dts
target/linux/ramips/dts/RT-N15.dts
target/linux/ramips/dts/RTN56U.dts
target/linux/ramips/dts/RUT5XX.dts
target/linux/ramips/dts/SL-R7205.dts
target/linux/ramips/dts/UR-326N4G.dts
target/linux/ramips/dts/UR-336UN.dts
target/linux/ramips/dts/V11STFE.dts
target/linux/ramips/dts/V22RW-2X2.dts
target/linux/ramips/dts/W150M.dts
target/linux/ramips/dts/W306R_V20.dts
target/linux/ramips/dts/W502U.dts
target/linux/ramips/dts/WCR150GN.dts
target/linux/ramips/dts/WHR-1166D.dts
target/linux/ramips/dts/WHR-300HP2.dts
target/linux/ramips/dts/WHR-600D.dts
target/linux/ramips/dts/WHR-G300N.dts
target/linux/ramips/dts/WL-351.dts
target/linux/ramips/dts/WL341V3.dts
target/linux/ramips/dts/WLI-TX4-AG300N.dts
target/linux/ramips/dts/WL_330N.dts
target/linux/ramips/dts/WL_330N3G.dts
target/linux/ramips/dts/WMR300.dts
target/linux/ramips/dts/WNCE2001.dts
target/linux/ramips/dts/WR512-3GN-4M.dts
target/linux/ramips/dts/WR512-3GN-8M.dts
target/linux/ramips/dts/WR6202.dts
target/linux/ramips/dts/WR8305RT.dts
target/linux/ramips/dts/WRTNODE.dts
target/linux/ramips/dts/XDXRN502J.dts

index 18a0448de42037c23aaedaddeb9ae4faaa39714f..2a5a80c4bfa8943adf6fdf84d741b35ed83139b9 100644 (file)
@@ -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
        ;;
index 2e831d29313ead4f5816559f6ef74d70cb62984f..f9ab1e33bafeea4c1be1f70c42cf964e92138262 100755 (executable)
@@ -58,9 +58,6 @@ ramips_board_detect() {
        *"AsiaRF AWAPN2403")
                name="awapn2403"
                ;;
-       *"BR6524N")
-               name="br6524n"
-               ;;
        *"Asus WL-330N")
                name="wl-330n"
                ;;
index 0be8c7252c946a6e960d7e539f3ef54057b866d9..a19ed452f65a56f745c49161eaae9605c33fb1cd 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                power {
index 265806154a81082b0caf76d7a01d7434b43a9787..6a2f46f2b3ce90e10b10d5259ab383b690c63521 100644 (file)
@@ -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 {
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                wlan {
index 93e864f6a8ce283529244cf0b02de378166e0a27..5095927c5b7716b8d856064e75d2381826fe3608 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 1276574e938288b1f4ceaa90656021b6de9eee1e..4a265460e05d87ed47b57efe2e46f88115998760 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                wlan {
index fe1eba960beab0ea8c260fad6d42528c247d934a..4da69a7329a2d607d08c942856ef245e9deebdf8 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                usb {
index e92118f17e43538913fd50a55eec3f4fdbc59a0e..581934a5324986b0055d2412b81c59ecdf711337 100644 (file)
                ralink,portmap = <0x3f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                rssilow {
index 6a704f1a24bb6662e184bd366df72fee3b7c078e..c4815d968da3cf1333fa960865dfa0932a44df27 100644 (file)
                ralink,portmap = <0x3f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                rssilow {
index 827e9df05b7a89cb144cf0463da78b993f91acc8..7c195714a0fadd6d4bafbe1e20e0304e65d855df 100644 (file)
                ralink,portmap = <0x3f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        ehci@101c0000 {
                status = "okay";
        };
index d599e71efc1a6a0b1f826e96688302d8988e056a..0d21508fba1b0db88d1b9032f7149b8d55b5c85b 100644 (file)
                ralink,portmap = <0x3f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        ehci@101c0000 {
                status = "okay";
        };
index fb04f017d5bd7563bd7ea347cc85609440787242..66108b1fb5b5e1ebea93e387204ddb873158a9fe 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 568d8f9d6494e89a68a6b031c9d5765f0e68ff42..bd45bc305bf4c4f0d9130f6c7701077e236cc2de 100644 (file)
@@ -50,7 +50,7 @@
                                        reg = <0xfe0000 0x10000>;
                                        read-only;
                                };
-                               partition@ff0000 {
+                               devdata: partition@ff0000 {
                                        label = "devdata";
                                        reg = <0xff0000 0x10000>;
                                        read-only;
                ralink,portmap = <0x1e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0x4000>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 1ddbb1c984d8f8738e338ded3441cba57664e393..d7e424d8688dfa76825d3a4909a5c279f0f365af 100644 (file)
                ralink,portmap = <0x1e>;
        };
 
+       /* devdata partition seems to be missing */
+/*     wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0x4000>;
+       };
+*/
        otg@101c0000 {
                status = "okay";
        };
index 068c8005b2e0d6cb0aa4feb6c29b547e84d92dc3..2de04022c7708f7bc545e3f22e86cd3dd9cf64b5 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                link {
index 61b2d76b32871ed6ea044b26e8b04ed9f383e3e4..12887d84812268a8f2d8beef0f00233cc146700d 100644 (file)
@@ -5,6 +5,10 @@
 / {
        model = "AsiaRF AWM002 EVB";
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                tx {
index dd1ce4cf54c295cb368b1b1c107a679d05990ab2..3be34bffa56f19a68a6aaf4e03019fc16d424a50 100644 (file)
@@ -5,6 +5,10 @@
 / {
        model = "AsiaRF AWM002 EVB";
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                tx {
index 54adbafad687719d48637a642b955e4ed9302373..0524f2d6d2a8350afb4122b4a7f4739c2544ffba 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 7df63c6583ea1aea7995119fa54a79b7e7b00f3f..6f836c832f5ce2e5f0b7e441893552031ba2af6c 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                power {
index b348889d9bb238251cef7548e52200f778b90b93..60b852560909516af08e4e6923b5880e002ab199 100644 (file)
                };
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pci@10140000 {
                status = "okay";
 
index 25e3b89db9bcca3cc90a186183f64cb5b190ca5e..db86f974767ccd1367945645a90807e0790de384 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                diskmounted {
index 520450a5cc70e782b6e9fda71adaf3a966081fe1..c33ed420bf30b003f22c4f0a5661a7bd2b0171ee 100644 (file)
                ralink,portmap = <0x3f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index d0cc0e5fc5da670fb9db446ee6779d8203e1bc22..2e0af387bd58e126f9effbc266ae628c27473e5b 100644 (file)
@@ -49,6 +49,7 @@
 
        wmac@10180000 {
                status = "okay";
+               ralink,mtd-eeprom = <&factory 0>;
        };
 
        ehci@101c0000 {
index c19e0dabb0ffe364053c9beb1388a57a0d580ebf..42f6fd3c6d0180084a62588c96ab0e14e753081f 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 1fd9e9a7e525566fd401246e727bf8b457f9dadf..0513f576af26e4bc27c3ec527bd31011b1b0eeaf 100644 (file)
@@ -34,7 +34,7 @@
                        read-only;
                };
 
-               partition@30000 {
+               devdata: partition@30000 {
                        label = "devdata";
                        reg = <0x30000 0x10000>;
                        read-only;
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                power {
index 8876d9b46a63a6e6e4713fa0c9aa49bb6f5adbd0..a497c04d5d5a4658d61abf76d6598c801577acdf 100644 (file)
                };
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 8c5fc523754b39fcf2107b4ea184560e793e374a..621bf088f16b91b2e3208e08a8ce3a1c5ffd2d32 100644 (file)
@@ -30,7 +30,7 @@
                        read-only;
                };
 
-               partition@30000 {
+               devdata: partition@30000 {
                        label = "devdata";
                        reg = <0x30000 0x10000>;
                        read-only;
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0x4000>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
index 492fd4ce8ac47c47ed0450e7351982f4173e546d..c1a1385c4457693809fc6dbb2f357ca1dea48da7 100644 (file)
                 };
         };
 
-        wmac@10180000 {
-                status = "okay";
+       wmac@10180000 {
+               status = "okay";
                ralink,led-polarity = <1>;
-        };
+               ralink,mtd-eeprom = <&factory 0>;
+       };
 };
 
index 34d7944edcb67685e38d48b9e5c4c7beb3eb9f66..8ec07c2e54ec44cbf1b32c56f4f52b9e84bd383e 100644 (file)
                ralink,led_polarity = <0x17>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                status {
index aa9309fbb7dedd19244eccd332c142044df2f23d..17903793ee76d377e7575881a26cada92d50b7eb 100644 (file)
@@ -30,7 +30,7 @@
                        read-only;
                };
 
-               partition@30000 {
+               devdata: partition@30000 {
                        label = "devdata";
                        reg = <0x30000 0x10000>;
                        read-only;
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0x4000>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
index f982ae0db70f7855bfd3090b7549c965ccd3f839..70e4a508ea401719b29af69ffaa69f948737f35b 100644 (file)
@@ -30,7 +30,7 @@
                        read-only;
                };
 
-               partition@30000 {
+               devdata: partition@30000 {
                        label = "devdata";
                        reg = <0x30000 0x10000>;
                        read-only;
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0x4000>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
index e6c104163a7dc51fbdc869457baf554081db2fa4..9893e7aa008dcda5ee5d3cf2edc948d9f3db266c 100644 (file)
@@ -65,7 +65,7 @@
        wmac@10180000 {
                status = "okay";
                ralink,led-polarity = <1>;
-               ralink,mtd-eeprom = <&devdata 16384>;
+               ralink,mtd-eeprom = <&devdata 0x4000>;
        };
 
        gpio-leds {
index b27bca061bc851e32d10f0559b7b2f18e7242be9..1a67b2dcaa7aafacec826a7f48b76ddba279be77 100644 (file)
@@ -30,7 +30,7 @@
                        read-only;
                };
 
-               partition@30000 {
+               devdata: partition@30000 {
                        label = "devdata";
                        reg = <0x30000 0x10000>;
                        read-only;
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devdata 0x4000>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
index 13d7f88c70dec2b96dc121d4c39f8c61921ad2e2..1165ff114ff377e97f1241e55fa7ffdb09e2a780 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                status {
index 070edafde1dccf02bd7a0ffdfe18dbac64bd1b1c..1ffa829e070fcd3d6ba6e3b57bedca28e394afcb 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
index c8632f067e8c54f9b8ce1a4822513dc9f90c34d2..e4eeb3ee6d5b70d212c8be9f31eeefca4dfc5fa6 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                status {
index 938055c8c99cc66e65c2008d7f23e25b53358ce3..0a9d83f85c697b3afe296c11bda29634867eb7d7 100644 (file)
@@ -71,6 +71,7 @@
 
        wmac@10180000 {
                ralink,5ghz = <0>;
+               ralink,mtd-eeprom = <&factory 0>;
        };
 
        ehci@101c0000 {
index 3760a465e019932d2ac6da25b86b098260f75aec..39e4232d4cbb89b6068387218ae880252005e5a2 100644 (file)
@@ -84,4 +84,8 @@
        esw@10110000 {
                ralink,portmap = <0x3e>;
        };
+
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
 };
index 0d1e9a8af500aae1dcb3456e37808e31af744b04..9026d82b7386284d51b50851a5f1ef7bf39907c1 100644 (file)
                };
        };
 
-       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>;
index 1b96cea764e310842975f34bea1ba64a62bbe431..7eaf16542b0b63af27b893b6712f2e8107991974 100644 (file)
@@ -25,7 +25,7 @@
                #size-cells = <1>;
 
                uboot: partition@0 {
-                       label = "u-boot";
+                       label = "uboot";
                        reg = <0x0 0x50000>;
                        read-only;
                };
                ralink,portmap = <0x3f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&uboot 0x40000>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index ea716257efd0c6fbdf6c3689e4aae56ea7e37efc..f660ff8f86430c9141f3a184b7c73f1f60922e3e 100644 (file)
                };
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pinctrl {
                state_default: pinctrl0 {
                        gpio {
index bb85bab5337a68f97268120166e2400897f28ef8..2e01457783f596baacf749d5633b7e23782b35e7 100644 (file)
                };
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 603ec363ea64d8d10b2828fa5c34c80f2400bd07..b221ae401b9fdfd5badb5f079b8177d9c044c333 100644 (file)
                ralink,portmap = <0x01>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 7496ca5456d8193350944b7f2afc667528e52b0d..41b7ddd34e1626eec5583b941b8599f4662e104b 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index d107b55396f058364c634ea45edc5fc47b7c865f..3be3fce7b4a15bc6e033cc2d4f1e42eac8f07388 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                usb {
index 058b7a27a3c6916fac1eba6a068c913bd8b4b605..b988dd095b0f1ef0455455dc2048ff5bfbede2c0 100644 (file)
@@ -96,6 +96,7 @@
 
        wmac@10180000 {
                status = "okay";
+               ralink,mtd-eeprom = <&factory 0>;
        };
 
        otg@101c0000 {
index a869427264b260a66a3ba8629fd06237ee387f5c..9b4ee34df509644d545ea2f5311b44dfe981dd8e 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        ehci@101c0000 {
                status = "okay";
        };
index 44141418c699326a1442a9de9cec1774b6d14433..56d6f515973765ab1f29aa5b9736b6b384d8dd95 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        ehci@101c0000 {
                status = "okay";
        };
index e25118791dc9fe1de22e4ae9ceb4527ade3e1967..a32a1cd8826cd1df13d86af6f5a6e11823b66a4b 100644 (file)
                ralink,port4 = "ephy";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pcie@10140000 {
                status = "okay";
        };
index 43a98ce97c6059bca497b98930c70ca136e2a489..790092e1aafaf1db5f555eba5a80d2727921d0f2 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                power {
index 07c5b3c35683fa8bf8b7a2644d86bbd0920d8a04..6ef27d006ed5428043f2c5f5cb0eeccf45d95937 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                power {
index dcf0e727a9310a51ab1236656e16bf6f905a0360..9f3121b2f1dda2ac31ba2d56ee2026ba08c4307b 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        ehci@101c0000 {
                status = "okay";
        };
index c67b832794e879adc20ea1fac39c565b93138fab..fa49bf10359ab31cd87ba7bcd0f85e39471f2e6a 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                cpu {
index ed94c5f6d7574ec47733f47dc0aff4da8d84d34c..4f4ecd492be157e13c42166989a018b1d6b69539 100644 (file)
                };
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        ehci@101c0000 {
                status = "okay";
        };
index 146e79b2452e84be1fe71712e33d813af879c741..c8bff4dd7d95e4fa3f4035bb631fac00edf36116 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 62e5f720edbb606e9000115b1c67e9fdc8daff91..509787ae8adb21de95b3eecb718581f81df69f50 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                wan {
index bee5e0f266c55fa328bd5886541d928653b01159..f94370f39c1036a26709d8533055841e5283129c 100644 (file)
@@ -75,4 +75,8 @@
        esw@10110000 {
                ralink,portmap = <0x2f>;
        };
+
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
 };
index 5b4aebc093aa80e3fd99f4040fdc640f5877ffeb..396e683dfb644a3bb99e92a3acdb8f4c7a91a4e2 100644 (file)
@@ -29,7 +29,7 @@
                                        read-only;
                                };
 
-                               factory: partition@40000 {
+                               devconf: partition@40000 {
                                        label = "devconf";
                                        reg = <0x40000 0x10000>;
                                        read-only;
        };
 
        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>;
index 0606ccb2453dfe9ae840bb6d2e14de6d9e641587..b51030c712927d4128751c16085ce308b7a21ac1 100644 (file)
@@ -27,7 +27,7 @@
                        read-only;
                };
 
-               partition@40000 {
+               devconf: partition@40000 {
                        label = "devconf";
                        reg = <0x40000 0x10000>;
                        read-only;
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&devconf 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                wps {
index ed344858f4f788d4d78abc37f5f3a1fa23e1fcdc..cac0d94d982b7d16674c22e338438b6469fb9381 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index d95365bc0e4941bc5cd4306e14addd96103bcfce..66ac0fc71be77bf2b0d48a32102930a2d38f03a1 100644 (file)
                ralink,port-map = "wllll";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pinctrl {
                state_default: pinctrl0 {
                        default {
index 893652055fe7153794b1e3bc1b236db200255617..23842d48b81c4f2e7c3a001fb60e692bf480bbdf 100644 (file)
                gpio-sck = <&gpio0 2 0>;
        };
 
+       wmac@480000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
index 305e36e85b8d332faead44a23fa1f4e65fd66ac5..4b7258333d08fdcba367f8660d2cc3cb372cbfd0 100644 (file)
@@ -56,7 +56,7 @@
        wmac@10180000 {
                status = "okay";
                ralink,2ghz = <0>;
-               ralink,eeprom = "soc_wmac.eeprom";
+               ralink,mtd-eeprom = <&factory 0>;
        };
 
        ehci@101c0000 {
index 530b8b12fb0e3e7ca2a2e49880b7f2580049b830..9ae699735244411b3e1a4ed7adb7d4fb7ececc93 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                status {
index 24bf94037998c83afad299c27dff1ac1ed67d8b6..574de55b49c908360eee42c286c1f54a716c2f11 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                wifi {
index 4af10bb8f437ab0bb023e31167d00609df0cd674..021efe584a25961207931f6fb01a5abebed5db6b 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                3g {
index 5ce7fa9efdc0c506a8e78e8d3bc748803ef11105..81d0be033f2e7c54bcf60765d306aaab07a9b4a2 100644 (file)
                #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 {
index 54ead081ddbe4afed770dff26e24c70598fea181..6fa6aa5c3e119617da8831a7a0d5597557edce70 100644 (file)
                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;
index 99e748e78daafb31ad2fb37016deca0b633a4ee5..7eff596676bd1ee5500b2b3688a970dd043da8cc 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                security {
index f3ab7191ca0c0323ec70a41fbd15088f88c8944c..915fb21d8a2226e22b5bd4271b5d45eabda2dc12 100644 (file)
        esw@10110000 {
                ralink,portmap = <0x2f>;
        };
+
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
 };
index 3f57b35bd818f0cd126771c38adc1f9264761172..1c2cf6af88abd373b0f785c07d328a316f4208b5 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                sys {
index af448eb7b17b71704cfe42cf236d60cf35dcb4a6..6d3282ea6453d146a7d00792c6a7ad5b99170eb2 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                usb {
index 976754eac1b60d6883d59c3e5ded941f630d8f4a..2a4fa115651d644f0ad81b55baeec23edb25cb94 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 47e0b1b6edf984b0a7d26fedeab6776406e20d5a..d62be1e10e58fcd9c78e9187785747793bbde48c 100644 (file)
                ralink,port4 = "ephy";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pcie@10140000 {
                status = "okay";
        };
index 28917fec93fae22863dad41aa011bd1c9e377a94..f3f2a9397d5384d1589fcbad9adb91bba6478e9b 100644 (file)
                ralink,port4 = "ephy";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                power {
index df38b8c95173f57a66b5593cb7460d7b4f34600a..5b4b900edc60db4a1840403cf997b9bf18fde6b6 100644 (file)
                ralink,port4 = "ephy";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pcie@10140000 {
                status = "okay";
        };
index 8cec31e03399955ed2f6bf7adb8105c73c876c61..30541313ad8b7d7b0ce9a99ddfaf7719c528a736 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       /* FIXME: no partitions defined */
+/*     wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+*/
        gpio-leds {
                compatible = "gpio-leds";
                diag {
index 1e6705c02c784aa2ae6c81a24770732fc9a4ec8b..fd30160692abe605de5007d42b0cd55f4ee8b384 100644 (file)
                ralink,fpa2 = <0x1f003fff>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 70317c7eeed5130cc8a6ff9419ef85d33bacc725..1271cfadbc7046920dc42784af4c8b1ccd9c3527 100644 (file)
@@ -21,7 +21,7 @@
                        read-only;
                };
 
-               partition@20000 {
+               boardnvram: partition@20000 {
                        label = "board-nvram";
                        reg = <0x20000 0x10000>;
                        read-only;
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&boardnvram 0xfd70>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                first {
index 063caed87b7440ef2e49d97e130f855e70c2f042..b144ca99864a771c66193e34dc9d9435a674faae 100644 (file)
                };
        };
 
+       wmac@480000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
index 4fc4368c3fca57c4fafbecaca0ed3108fb572247..999a29d3308bdcfd990543b665416442dbd03005 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                link {
index 1c88ed31aa9c2664102a5a174412c14a8155d930..3b29104af58431607ac317d9c19072d0191e34fd 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                3g {
index 56cf6a60f1c58c176af75c3d97a345736992aa15..b6bce43575d137cff59281d856c0603a741c9101 100644 (file)
                ralink,port-map = "wllll";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pinctrl {
                state_default: pinctrl0 {
                        default {
index 10910afe31146df3c3b1e6df7d711c7de0812276..d8a3b0badfe415f87c379cd11987b018c44bf622 100644 (file)
                mtd-mac-address = <&factory 0x28>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                power-green {
index fccd04aed9c7ebee18672c196ecc46acaa13fb49..009897024736620f113ba149a8e5287a345ed90f 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                3g {
index 01da52340e492a3960c132f8e65426c4e62a6c0f..20a325cd71c1b6dcf2d3dbf4e50331e5ff96bfd4 100644 (file)
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                3g {
index ed3e70851d9c4708b0b9b9a2ab5b00f298d18784..a769a98abc493593ab27915b80e9d7608cfba890 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        otg@101c0000 {
                status = "okay";
        };
index 81653f509d90d70bc590eb68943ceb5552ac9c15..c28e422eea635cd3b0b1d018b0fa007946b2e7fd 100644 (file)
                ralink,port-map = "llllw";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pinctrl {
                state_default: pinctrl0 {
                        ephy {
index 2e0b71bcc2c9a718de780a52d9fe286b3e5f4eb4..3fb2303e0267abf52faf43b9322e22452d16cc88 100644 (file)
                ralink,port-map = "wllll";
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        pinctrl {
                state_default: pinctrl0 {
                        default {
index 628324cfbbab20e9a264e6b41d2a3fabaa476026..000f9db40549635c844d62b278b3133957a149b2 100644 (file)
                ralink,portmap = <0x3e>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                wifi {