bcm63xx: Enable endian check support for ath9k pci fixup.
Some ath9k caldatas need to be "endian checked". This patch allows selecting wether to enable endian check or not. Endian check is disabled by default. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 34105
This commit is contained in:
parent
f2b75b517b
commit
f2bb7754f5
@ -0,0 +1,51 @@
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
|
||||
@@ -2,6 +2,7 @@
|
||||
#define _PCI_ATH9K_FIXUP
|
||||
|
||||
|
||||
-void pci_enable_ath9k_fixup(unsigned slot, u32 offset) __init;
|
||||
+void pci_enable_ath9k_fixup(unsigned slot, u32 offset,
|
||||
+ unsigned endian_check) __init;
|
||||
|
||||
#endif /* _PCI_ATH9K_FIXUP */
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
@@ -18,6 +18,7 @@
|
||||
struct ath9k_caldata {
|
||||
unsigned int slot;
|
||||
u32 caldata_offset;
|
||||
+ unsigned int endian_check:1;
|
||||
};
|
||||
|
||||
/*
|
||||
--- a/arch/mips/bcm63xx/pci-ath9k-fixup.c
|
||||
+++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
|
||||
@@ -172,12 +172,14 @@ static void ath9k_pci_fixup(struct pci_d
|
||||
}
|
||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup);
|
||||
|
||||
-void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset)
|
||||
+void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset,
|
||||
+ unsigned endian_check)
|
||||
{
|
||||
if (ath9k_num_fixups >= ARRAY_SIZE(ath9k_fixups))
|
||||
return;
|
||||
|
||||
ath9k_fixups[ath9k_num_fixups].slot = slot;
|
||||
+ ath9k_fixups[ath9k_num_fixups].pdata.endian_check = endian_check;
|
||||
|
||||
if (!bcm63xx_read_eeprom(ath9k_fixups[ath9k_num_fixups].pdata.eeprom_data, offset))
|
||||
return;
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -938,7 +938,8 @@ int __init board_register_devices(void)
|
||||
|
||||
/* register any fixups */
|
||||
for (i = 0; i < board.has_caldata; i++)
|
||||
- pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset);
|
||||
+ pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
|
||||
+ board.caldata[i].endian_check);
|
||||
|
||||
return 0;
|
||||
}
|
@ -0,0 +1,51 @@
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
|
||||
@@ -2,6 +2,7 @@
|
||||
#define _PCI_ATH9K_FIXUP
|
||||
|
||||
|
||||
-void pci_enable_ath9k_fixup(unsigned slot, u32 offset) __init;
|
||||
+void pci_enable_ath9k_fixup(unsigned slot, u32 offset,
|
||||
+ unsigned endian_check) __init;
|
||||
|
||||
#endif /* _PCI_ATH9K_FIXUP */
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
@@ -18,6 +18,7 @@
|
||||
struct ath9k_caldata {
|
||||
unsigned int slot;
|
||||
u32 caldata_offset;
|
||||
+ unsigned int endian_check:1;
|
||||
};
|
||||
|
||||
/*
|
||||
--- a/arch/mips/bcm63xx/pci-ath9k-fixup.c
|
||||
+++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
|
||||
@@ -172,12 +172,14 @@ static void ath9k_pci_fixup(struct pci_d
|
||||
}
|
||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup);
|
||||
|
||||
-void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset)
|
||||
+void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset,
|
||||
+ unsigned endian_check)
|
||||
{
|
||||
if (ath9k_num_fixups >= ARRAY_SIZE(ath9k_fixups))
|
||||
return;
|
||||
|
||||
ath9k_fixups[ath9k_num_fixups].slot = slot;
|
||||
+ ath9k_fixups[ath9k_num_fixups].pdata.endian_check = endian_check;
|
||||
|
||||
if (!bcm63xx_read_eeprom(ath9k_fixups[ath9k_num_fixups].pdata.eeprom_data, offset))
|
||||
return;
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -983,7 +983,8 @@ int __init board_register_devices(void)
|
||||
|
||||
/* register any fixups */
|
||||
for (i = 0; i < board.has_caldata; i++)
|
||||
- pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset);
|
||||
+ pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
|
||||
+ board.caldata[i].endian_check);
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user