mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ramips: use the ralink,mtd-eeprom device tree property

Browse Source 
Use the ralink,mtd-eeprom instead of invoking the userspace firmware
loader.

Set the label and compatible string according to the the PCI binding
documentation.

Use the wifi@0,0 label and the pci0,0 compatible string in case the
PCI vendor and device id is unknown. It should work anyway since the
compatible string isn't evaluated (yet).

This commit might fixes the PCIe wireless for the Buffalo WHR-600D.
This board was mentioned in the board 10-rt2x00-eeprom firmware hotplug
script but never had the correct eeprom name set to trigger the
firmware from flash extraction.

Use the usual eeprom for the soc wmac of the Dovado Tiny AC.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2016-11-07 22:02:20 +01:00
parent 21d8de78dc
commit d8dd207ea6
7 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,25 +43,14 @@ board=$(ramips_board_name)
case "$FIRMWARE" in
"soc_wmac.eeprom")
case $board in
*)
rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
;;
esac
;;
"rt2x00pci_1_0.eeprom")
case $board in
cy-swr1100)
rt2x00_eeprom_extract "factory" 8192 512
;;
br-6475nd | rt-n56u | whr-600d | whr-1166d)
rt2x00_eeprom_extract "factory" 32768 512
;;
tiny-ac)
wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
rt2x00_eeprom_extract "factory" 0 512
rt2x00_eeprom_set_macaddr $wifi_mac
;;
*)
rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
;;
esac
;;
esac

8
target/linux/ramips/dts/BR-6475ND.dts
View File

@ -157,11 +157,11 @@
pci-bridge@1 {
status = "okay";
wmac@0,0 {
wifi@0,0 {
compatible = "pci0,0";
reg = <0x10000 0 0 0 0>;
ralink,5ghz = <0>;
compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
reg = < 0x10000 0 0 0 0 >;
ralink,eeprom = "rt2x00pci_1_0.eeprom";
ralink,mtd-eeprom = <&factory 0x8000>;
};
};
};

8
target/linux/ramips/dts/CY-SWR1100.dts
View File

@ -125,11 +125,11 @@
pci-bridge@1 {
status = "okay";
wmac@0,0 {
wifi@0,0 {
compatible = "pci0,0";
reg = <0x10000 0 0 0 0>;
ralink,5ghz = <0>;
compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
reg = < 0x10000 0 0 0 0 >;
ralink,eeprom = "rt2x00pci_1_0.eeprom";
ralink,mtd-eeprom = <&factory 0x2000>;
};
};
};

8
target/linux/ramips/dts/RT-N56U.dts
View File

@ -125,10 +125,10 @@
pci-bridge@1 {
status = "okay";
wmac@0,0 {
compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
reg = < 0x10000 0 0 0 0 >;
ralink,eeprom = "rt2x00pci_1_0.eeprom";
wifi@1814,3091 {
compatible = "pci1814,3091";
reg = <0x10000 0 0 0 0>;
ralink,mtd-eeprom = <&factory 0x8000>;
};
};
};

4
target/linux/ramips/dts/TINY-AC.dts
View File

@ -145,10 +145,6 @@
mediatek,mt7530 = <1>;
};
&wmac {
ralink,eeprom = "rt2x00pci_1_0.eeprom";
};
&pcie {
status = "okay";
};

6
target/linux/ramips/dts/WHR-1166D.dts
View File

@ -160,10 +160,10 @@
status = "okay";
pcie-bridge {
mt76@0,0 {
wifi@0,0 {
compatible = "pci0,0";
reg = <0x0000 0 0 0 0>;
device_type = "pci";
mediatek,mtd-eeprom = <&factory 32768>;
mediatek,mtd-eeprom = <&factory 0x8000>;
mediatek,2ghz = <0>;
};
};

8
target/linux/ramips/dts/WHR-600D.dts
View File

@ -145,4 +145,12 @@
&pcie {
status = "okay";
pcie-bridge {
wifi@1814,3091 {
compatible = "pci1814,3091";
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
};
};
};