hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lantiq: refresh patches 

this adds ben's ath9k fixup

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41269 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-06-19 14:12:59 +00:00
parent 5b5afc12c3
commit 6732ce3406
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
target/linux/lantiq/patches-3.10/0010-MIPS-lantiq-wifi-and-ethernet-eeprom-handling.patch
View File

@ -41,8 +41,9 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
#endif /* _LTQ_XWAY_H__ */ #endif /* _LTQ_XWAY_H__ */
--- a/arch/mips/lantiq/xway/Makefile --- a/arch/mips/lantiq/xway/Makefile
+++ b/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile
@@ -1,3 +1,6 @@ @@ -2,4 +2,7 @@ obj-y := prom.o sysctrl.o clk.o reset.o
obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
obj-y += vmmc.o
+obj-y += eth_mac.o +obj-y += eth_mac.o
+obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o +obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o
@ -50,7 +51,7 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o
--- /dev/null --- /dev/null
+++ b/arch/mips/lantiq/xway/ath_eep.c +++ b/arch/mips/lantiq/xway/ath_eep.c
@@ -0,0 +1,250 @@ @@ -0,0 +1,271 @@
+/* +/*
+ * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org> + * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org>
+ * Copyright (C) 2011 John Crispin <blogic@openwrt.org> + * Copyright (C) 2011 John Crispin <blogic@openwrt.org>
@ -88,6 +89,7 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
+ return 0; + return 0;
+} +}
+ +
+static int ath9k_eep_load;
+int __init of_ath9k_eeprom_probe(struct platform_device *pdev) +int __init of_ath9k_eeprom_probe(struct platform_device *pdev)
+{ +{
+ struct device_node *np = pdev->dev.of_node, *mtd_np; + struct device_node *np = pdev->dev.of_node, *mtd_np;
@ -170,6 +172,13 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
+ ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data); + ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data);
+ +
+ dev_info(&pdev->dev, "pci slot: %u\n", pci_slot); + 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"); + dev_info(&pdev->dev, "loaded ath9k eeprom\n");
@ -192,9 +201,22 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
+ +
+static int __init of_ath9k_eeprom_init(void) +static int __init of_ath9k_eeprom_init(void)
+{ +{
+ return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe); + int ret = platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
+
+ if (ret)
+ ath9k_eep_load = 1;
+
+ return ret;
+} +}
+arch_initcall(of_ath9k_eeprom_init); +
+static int __init of_ath9k_eeprom_init_late(void)
+{
+ if (!ath9k_eep_load)
+ return 0;
+ return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
+}
+late_initcall(of_ath9k_eeprom_init_late);
+subsys_initcall(of_ath9k_eeprom_init);
+ +
+ +
+static int ath5k_pci_plat_dev_init(struct pci_dev *dev) +static int ath5k_pci_plat_dev_init(struct pci_dev *dev)

4
target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device @@ -927,10 +927,13 @@ static int m25p_probe(struct spi_device
unsigned i; unsigned i;
struct mtd_part_parser_data ppdata; struct mtd_part_parser_data ppdata;
struct device_node __maybe_unused *np = spi->dev.of_node; struct device_node __maybe_unused *np = spi->dev.of_node;
@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#endif #endif
/* Platform data helps sort out which chip type we have, as /* Platform data helps sort out which chip type we have, as
@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device @@ -1006,6 +1009,8 @@ static int m25p_probe(struct spi_device
if (data && data->name) if (data && data->name)
flash->mtd.name = data->name; flash->mtd.name = data->name;

2
target/linux/lantiq/patches-3.10/0100-mtd-split.patch
View File

@ -6,8 +6,8 @@
-obj-y += vmmc.o -obj-y += vmmc.o
+obj-y += vmmc.o mtd_split.o +obj-y += vmmc.o mtd_split.o
obj-y += eth_mac.o
obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o
--- /dev/null --- /dev/null
+++ b/arch/mips/lantiq/xway/mtd_split.c +++ b/arch/mips/lantiq/xway/mtd_split.c
@@ -0,0 +1,129 @@ @@ -0,0 +1,129 @@

2
target/linux/lantiq/patches-3.10/0103-tffs.patch
View File

@ -12,8 +12,8 @@ Subject: add basic tffs driver
-obj-y += vmmc.o mtd_split.o -obj-y += vmmc.o mtd_split.o
+obj-y += vmmc.o mtd_split.o tffs.o +obj-y += vmmc.o mtd_split.o tffs.o
obj-y += eth_mac.o
obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o
--- /dev/null --- /dev/null
+++ b/arch/mips/lantiq/xway/tffs.c +++ b/arch/mips/lantiq/xway/tffs.c
@@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@