KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm63xx: add support for inverting ath9k LED polarity

Browse source 
Some devices with ath9k WiFi require changing the default active low
polarity to high in order to correctly operate the WiFi status LEDs.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2016-06-02 20:41:17 +02:00
parent ec95509af4
commit 7807c7e867
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/brcm63xx/patches-4.4/421-BCM63XX-add-led-pin-for-ath9k.patch
View file

@ -5,18 +5,18 @@
for (i = 0; i < board.has_caldata; i++) 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); - board.caldata[i].endian_check);
+ board.caldata[i].endian_check, board.caldata[i].led_pin); + board.caldata[i].endian_check, board.caldata[i].led_pin, board.caldata[i].led_active_high);
return 0; return 0;
} }
--- a/arch/mips/bcm63xx/pci-ath9k-fixup.c --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c
+++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
@@ -182,13 +182,14 @@ static void ath9k_pci_fixup(struct pci_d @@ -182,13 +182,15 @@ static void ath9k_pci_fixup(struct pci_d
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup); 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) - unsigned endian_check)
+ unsigned endian_check, int led_pin) + unsigned endian_check, int led_pin, bool led_active_high)
{ {
if (ath9k_num_fixups >= ARRAY_SIZE(ath9k_fixups)) if (ath9k_num_fixups >= ARRAY_SIZE(ath9k_fixups))
return; return;
@ -24,16 +24,18 @@
ath9k_fixups[ath9k_num_fixups].slot = slot; ath9k_fixups[ath9k_num_fixups].slot = slot;
ath9k_fixups[ath9k_num_fixups].pdata.endian_check = endian_check; ath9k_fixups[ath9k_num_fixups].pdata.endian_check = endian_check;
+ ath9k_fixups[ath9k_num_fixups].pdata.led_pin = led_pin; + ath9k_fixups[ath9k_num_fixups].pdata.led_pin = led_pin;
+ ath9k_fixups[ath9k_num_fixups].pdata.led_active_high = led_active_high;
if (!bcm63xx_read_eeprom(ath9k_fixups[ath9k_num_fixups].pdata.eeprom_data, offset)) if (!bcm63xx_read_eeprom(ath9k_fixups[ath9k_num_fixups].pdata.eeprom_data, offset))
return; return;
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -21,6 +21,7 @@ struct ath9k_caldata { @@ -21,6 +21,8 @@ struct ath9k_caldata {
unsigned int slot; unsigned int slot;
u32 caldata_offset; u32 caldata_offset;
unsigned int endian_check:1; unsigned int endian_check:1;
+ int led_pin; + int led_pin;
+ bool led_active_high;
}; };
/* /*
@ -44,6 +46,6 @@
void pci_enable_ath9k_fixup(unsigned slot, u32 offset, void pci_enable_ath9k_fixup(unsigned slot, u32 offset,
- unsigned endian_check) __init; - unsigned endian_check) __init;
+ unsigned endian_check, int led_pin) __init; + unsigned endian_check, int led_pin, bool led_active_high) __init;
#endif /* _PCI_ATH9K_FIXUP */ #endif /* _PCI_ATH9K_FIXUP */

9
target/linux/brcm63xx/patches-4.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
View file

@ -42,13 +42,13 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
/* register any fixups */ /* register any fixups */
- for (i = 0; i < board.has_caldata; i++) - 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, board.caldata[i].led_pin); - board.caldata[i].endian_check, board.caldata[i].led_pin, board.caldata[i].led_active_high);
+ for (i = 0; i < board.has_caldata; i++) { + for (i = 0; i < board.has_caldata; i++) {
+ switch (board.caldata[i].vendor) { + switch (board.caldata[i].vendor) {
+ case PCI_VENDOR_ID_ATHEROS: + case PCI_VENDOR_ID_ATHEROS:
+ pci_enable_ath9k_fixup(board.caldata[i].slot, + pci_enable_ath9k_fixup(board.caldata[i].slot,
+ board.caldata[i].caldata_offset, board.caldata[i].endian_check, + board.caldata[i].caldata_offset, board.caldata[i].endian_check,
+ board.caldata[i].led_pin); + board.caldata[i].led_pin, board.caldata[i].led_active_high);
+ break; + break;
+ case PCI_VENDOR_ID_RALINK: + case PCI_VENDOR_ID_RALINK:
+ pci_enable_rt2x00_fixup(board.caldata[i].slot, + pci_enable_rt2x00_fixup(board.caldata[i].slot,
@ -166,7 +166,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
/* /*
* flash mapping * flash mapping
@@ -17,11 +18,15 @@ @@ -17,12 +18,16 @@
#define BCM963XX_CFE_VERSION_OFFSET 0x570 #define BCM963XX_CFE_VERSION_OFFSET 0x570
#define BCM963XX_NVRAM_OFFSET 0x580 #define BCM963XX_NVRAM_OFFSET 0x580
@ -178,12 +178,13 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
+ /* Atheros */ + /* Atheros */
unsigned int endian_check:1; unsigned int endian_check:1;
int led_pin; int led_pin;
bool led_active_high;
+ /* Ralink */ + /* Ralink */
+ char* eeprom; + char* eeprom;
}; };
/* /*
@@ -47,7 +52,7 @@ struct board_info { @@ -48,7 +53,7 @@ struct board_info {
unsigned int has_caldata:2; unsigned int has_caldata:2;
/* wifi calibration data config */ /* wifi calibration data config */