From: John Crispin <john@openwrt.org>
Date: Sun, 30 Mar 2014 09:16:31 +0000 (+0000)
Subject: lantiq: fixup ath5k support
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0c73e85cd0475ecaedc92802f9a993a26fe79a11;p=openwrt%2Fstaging%2Fnbd.git

lantiq: fixup ath5k support

http://patchwork.openwrt.org/patch/4417/

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40323
---

diff --git a/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
new file mode 100644
index 0000000000..9806fbb7b7
--- /dev/null
+++ b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
@@ -0,0 +1,55 @@
+Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
+===================================================================
+--- linux-3.10.34.orig/arch/mips/lantiq/xway/ath_eep.c	2014-03-29 20:17:33.826386600 +0000
++++ linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c	2014-03-29 20:18:19.610387315 +0000
+@@ -36,6 +36,7 @@
+ 	return 0;
+ }
+ 
++static int ath9k_eep_load;
+ int __init of_ath9k_eeprom_probe(struct platform_device *pdev)
+ {
+ 	struct device_node *np = pdev->dev.of_node, *mtd_np;
+@@ -112,6 +113,12 @@
+ 	if (!of_property_read_u32(np, "ath,pci-slot", &pci_slot)) {
+ 		ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data);
+ 		dev_info(&pdev->dev, "pci slot: %u\n", pci_slot);
++		if (ath9k_eep_load) {
++			struct pci_dev *d = NULL;
++			while ((d = pci_get_device(PCI_VENDOR_ID_ATHEROS,
++					PCI_ANY_ID, d)) != NULL)
++				pci_fixup_device(pci_fixup_early, d);
++		}
+ 	}
+ 
+ 	dev_info(&pdev->dev, "loaded ath9k eeprom\n");
+@@ -132,20 +139,19 @@
+ 	},
+ };
+ 
+-static int ath9k_eep_loaded;
+ static int __init of_ath9k_eeprom_init(void)
+ {
+ 	int ret = platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
+ 
+-	if (!ret)
+-		ath9k_eep_loaded = 1;
++	if (ret)
++		ath9k_eep_load = 1;
+ 
+ 	return ret;
+ }
+ 
+ static int __init of_ath9k_eeprom_init_late(void)
+ {
+-	if (ath9k_eep_loaded)
++	if (!ath9k_eep_load)
+ 		return 0;
+ 	return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
+ }
+@@ -247,4 +253,4 @@
+ {
+ 	return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe);
+ }
+-device_initcall(of_ath5k_eeprom_init);
++subsys_initcall(of_ath5k_eeprom_init);