2127bf39802980da9769db4de02cda1ac17eab8c
[openwrt/staging/lynxis.git] / target / linux / brcm63xx / patches-3.7 / 444-BCM63XX-add-endian-check-for-ath9k.patch
1 From: Álvaro Fernández Rojas <noltari@gmail.com>
2 Subject: [PATCH] BCM63XX: add endian check for ath9k
3 --- a/arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
4 +++ b/arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
5 @@ -2,6 +2,7 @@
6 #define _PCI_ATH9K_FIXUP
7
8
9 -void pci_enable_ath9k_fixup(unsigned slot, u32 offset) __init;
10 +void pci_enable_ath9k_fixup(unsigned slot, u32 offset,
11 + unsigned endian_check) __init;
12
13 #endif /* _PCI_ATH9K_FIXUP */
14 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
15 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
16 @@ -19,6 +19,7 @@
17 struct ath9k_caldata {
18 unsigned int slot;
19 u32 caldata_offset;
20 + unsigned int endian_check:1;
21 };
22
23 /*
24 --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c
25 +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
26 @@ -172,12 +172,14 @@ static void ath9k_pci_fixup(struct pci_d
27 }
28 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup);
29
30 -void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset)
31 +void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset,
32 + unsigned endian_check)
33 {
34 if (ath9k_num_fixups >= ARRAY_SIZE(ath9k_fixups))
35 return;
36
37 ath9k_fixups[ath9k_num_fixups].slot = slot;
38 + ath9k_fixups[ath9k_num_fixups].pdata.endian_check = endian_check;
39
40 if (!bcm63xx_read_eeprom(ath9k_fixups[ath9k_num_fixups].pdata.eeprom_data, offset))
41 return;
42 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
43 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
44 @@ -992,7 +992,8 @@ int __init board_register_devices(void)
45
46 /* register any fixups */
47 for (i = 0; i < board.has_caldata; i++)
48 - pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset);
49 + pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
50 + board.caldata[i].endian_check);
51
52 return 0;
53 }