Changeset 38041


Ignore:
Timestamp:
2013-09-18T18:31:41+02:00 (4 years ago)
Author:
blogic
Message:

lantiq: fix ath9k eeprom loading order bug

https://dev.archive.openwrt.org/ticket/14131.html
http://patchwork.openwrt.org/patch/4038/

Signed-off-by: John Crispin <blogic@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/lantiq/patches-3.10/0010-MIPS-lantiq-wifi-and-ethernet-eeprom-handling.patch

    r38031 r38041  
    1818 create mode 100644 arch/mips/lantiq/xway/rt_eep.c 
    1919 
    20 diff --git a/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h 
    21 new file mode 100644 
    22 index 0000000..095d261 
    23 --- /dev/null 
    24 +++ b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h 
     20Index: linux-3.10.12/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h 
     21=================================================================== 
     22--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     23+++ linux-3.10.12/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h     2013-09-17 22:32:50.385021711 +0200 
    2524@@ -0,0 +1,6 @@ 
    2625+#ifndef _PCI_ATH_FIXUP 
     
    3029+ 
    3130+#endif /* _PCI_ATH_FIXUP */ 
    32 diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
    33 index 133336b..779715c 100644 
    34 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
    35 +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
    36 @@ -90,5 +90,8 @@ int xrx200_gphy_boot(struct device *dev, unsigned int id, dma_addr_t dev_addr); 
     31Index: linux-3.10.12/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
     32=================================================================== 
     33--- linux-3.10.12.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h      2013-09-14 15:55:12.000000000 +0200 
     34+++ linux-3.10.12/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h   2013-09-17 22:32:50.389021711 +0200 
     35@@ -90,5 +90,8 @@ 
    3736 extern void ltq_pmu_enable(unsigned int module); 
    3837 extern void ltq_pmu_disable(unsigned int module); 
     
    4342 #endif /* CONFIG_SOC_TYPE_XWAY */ 
    4443 #endif /* _LTQ_XWAY_H__ */ 
    45 diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile 
    46 index da51fe0..0af7a54 100644 
    47 --- a/arch/mips/lantiq/xway/Makefile 
    48 +++ b/arch/mips/lantiq/xway/Makefile 
    49 @@ -2,4 +2,6 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o 
     44Index: linux-3.10.12/arch/mips/lantiq/xway/Makefile 
     45=================================================================== 
     46--- linux-3.10.12.orig/arch/mips/lantiq/xway/Makefile   2013-09-17 22:32:50.305021707 +0200 
     47+++ linux-3.10.12/arch/mips/lantiq/xway/Makefile        2013-09-18 02:41:31.613659574 +0200 
     48@@ -2,4 +2,6 @@ 
    5049  
    5150 obj-y += vmmc.o 
     
    5453+ 
    5554 obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o 
    56 diff --git a/arch/mips/lantiq/xway/ath_eep.c b/arch/mips/lantiq/xway/ath_eep.c 
    57 new file mode 100644 
    58 index 0000000..1146f01 
    59 --- /dev/null 
    60 +++ b/arch/mips/lantiq/xway/ath_eep.c 
    61 @@ -0,0 +1,237 @@ 
     55Index: linux-3.10.12/arch/mips/lantiq/xway/ath_eep.c 
     56=================================================================== 
     57--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     58+++ linux-3.10.12/arch/mips/lantiq/xway/ath_eep.c       2013-09-18 02:41:28.525659442 +0200 
     59@@ -0,0 +1,250 @@ 
    6260+/* 
    6361+ *  Copyright (C) 2011 Luca Olivetti <luca@ventoso.org> 
     
    194192+}; 
    195193+ 
     194+static int ath9k_eep_loaded; 
    196195+static int __init of_ath9k_eeprom_init(void) 
    197196+{ 
     197+       int ret = platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe); 
     198+ 
     199+       if (!ret) 
     200+               ath9k_eep_loaded = 1; 
     201+ 
     202+       return ret; 
     203+} 
     204+ 
     205+static int __init of_ath9k_eeprom_init_late(void) 
     206+{ 
     207+       if (ath9k_eep_loaded) 
     208+               return 0; 
    198209+       return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe); 
    199210+} 
    200 +late_initcall(of_ath9k_eeprom_init); 
    201 + 
     211+late_initcall(of_ath9k_eeprom_init_late); 
     212+subsys_initcall(of_ath9k_eeprom_init); 
    202213+ 
    203214+static int ath5k_pci_plat_dev_init(struct pci_dev *dev) 
     
    297308+} 
    298309+device_initcall(of_ath5k_eeprom_init); 
    299 diff --git a/arch/mips/lantiq/xway/pci-ath-fixup.c b/arch/mips/lantiq/xway/pci-ath-fixup.c 
    300 new file mode 100644 
    301 index 0000000..c87ffb2 
    302 --- /dev/null 
    303 +++ b/arch/mips/lantiq/xway/pci-ath-fixup.c 
     310Index: linux-3.10.12/arch/mips/lantiq/xway/pci-ath-fixup.c 
     311=================================================================== 
     312--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     313+++ linux-3.10.12/arch/mips/lantiq/xway/pci-ath-fixup.c 2013-09-17 22:32:50.389021711 +0200 
    304314@@ -0,0 +1,109 @@ 
    305315+/* 
     
    412422+       ath_num_fixups++; 
    413423+} 
    414 diff --git a/arch/mips/lantiq/xway/rt_eep.c b/arch/mips/lantiq/xway/rt_eep.c 
    415 new file mode 100644 
    416 index 0000000..00f2d4c 
    417 --- /dev/null 
    418 +++ b/arch/mips/lantiq/xway/rt_eep.c 
     424Index: linux-3.10.12/arch/mips/lantiq/xway/rt_eep.c 
     425=================================================================== 
     426--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     427+++ linux-3.10.12/arch/mips/lantiq/xway/rt_eep.c        2013-09-17 22:32:50.389021711 +0200 
    419428@@ -0,0 +1,60 @@ 
    420429+/* 
     
    478487+} 
    479488+device_initcall(of_ralink_eeprom_init); 
    480 --  
    481 1.7.10.4 
    482  
Note: See TracChangeset for help on using the changeset viewer.