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
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
;;
*"AsiaRF AWAPN2403")
name="awapn2403"
;;
- *"BR6524N")
- name="br6524n"
- ;;
*"Asus WL-330N")
name="wl-330n"
;;
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
power {
/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 {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
wlan {
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
usb {
ralink,portmap = <0x3f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
rssilow {
ralink,portmap = <0x3f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
rssilow {
ralink,portmap = <0x3f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
ehci@101c0000 {
status = "okay";
};
ralink,portmap = <0x3f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
ehci@101c0000 {
status = "okay";
};
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
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";
};
ralink,portmap = <0x1e>;
};
+ /* devdata partition seems to be missing */
+/* wmac@10180000 {
+ ralink,mtd-eeprom = <&devdata 0x4000>;
+ };
+*/
otg@101c0000 {
status = "okay";
};
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
link {
/ {
model = "AsiaRF AWM002 EVB";
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
tx {
/ {
model = "AsiaRF AWM002 EVB";
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
tx {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
power {
};
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pci@10140000 {
status = "okay";
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
diskmounted {
ralink,portmap = <0x3f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
wmac@10180000 {
status = "okay";
+ ralink,mtd-eeprom = <&factory 0>;
};
ehci@101c0000 {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
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 {
};
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
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>;
};
};
- wmac@10180000 {
- status = "okay";
+ wmac@10180000 {
+ status = "okay";
ralink,led-polarity = <1>;
- };
+ ralink,mtd-eeprom = <&factory 0>;
+ };
};
ralink,led_polarity = <0x17>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
status {
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>;
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>;
wmac@10180000 {
status = "okay";
ralink,led-polarity = <1>;
- ralink,mtd-eeprom = <&devdata 16384>;
+ ralink,mtd-eeprom = <&devdata 0x4000>;
};
gpio-leds {
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>;
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
status {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
status {
wmac@10180000 {
ralink,5ghz = <0>;
+ ralink,mtd-eeprom = <&factory 0>;
};
ehci@101c0000 {
esw@10110000 {
ralink,portmap = <0x3e>;
};
+
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
};
};
};
- 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>;
#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";
};
};
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pinctrl {
state_default: pinctrl0 {
gpio {
};
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,portmap = <0x01>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
usb {
wmac@10180000 {
status = "okay";
+ ralink,mtd-eeprom = <&factory 0>;
};
otg@101c0000 {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
ehci@101c0000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
ehci@101c0000 {
status = "okay";
};
ralink,port4 = "ephy";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pcie@10140000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
power {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
power {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
ehci@101c0000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
cpu {
};
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
ehci@101c0000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
wan {
esw@10110000 {
ralink,portmap = <0x2f>;
};
+
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
};
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>;
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 {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,port-map = "wllll";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pinctrl {
state_default: pinctrl0 {
default {
gpio-sck = <&gpio0 2 0>;
};
+ wmac@480000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
wmac@10180000 {
status = "okay";
ralink,2ghz = <0>;
- ralink,eeprom = "soc_wmac.eeprom";
+ ralink,mtd-eeprom = <&factory 0>;
};
ehci@101c0000 {
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
status {
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
wifi {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
3g {
#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 {
status = "okay";
};
+ wmac@480000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pci@10140000 {
status = "okay";
read-only;
};
- partition@40000 {
+ factory: partition@40000 {
reg = <0x00040000 0x00010000>;
label = "factory";
read-only;
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
security {
esw@10110000 {
ralink,portmap = <0x2f>;
};
+
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
};
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
sys {
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
usb {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,port4 = "ephy";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pcie@10140000 {
status = "okay";
};
ralink,port4 = "ephy";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
power {
ralink,port4 = "ephy";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pcie@10140000 {
status = "okay";
};
ralink,portmap = <0x2f>;
};
+ /* FIXME: no partitions defined */
+/* wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+*/
gpio-leds {
compatible = "gpio-leds";
diag {
ralink,fpa2 = <0x1f003fff>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
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 {
};
};
+ wmac@480000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
link {
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
3g {
ralink,port-map = "wllll";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pinctrl {
state_default: pinctrl0 {
default {
mtd-mac-address = <&factory 0x28>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
power-green {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
3g {
ralink,portmap = <0x2f>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
3g {
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
otg@101c0000 {
status = "okay";
};
ralink,port-map = "llllw";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pinctrl {
state_default: pinctrl0 {
ephy {
ralink,port-map = "wllll";
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
pinctrl {
state_default: pinctrl0 {
default {
ralink,portmap = <0x3e>;
};
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
gpio-leds {
compatible = "gpio-leds";
wifi {