projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | From: Bob Copeland <me@bobcopeland.com> |
| 2 | Subject: ath5k: support LEDs on Acer Aspire One netbook | |
| 3 | Patch-mainline: 2.6.30 | |
| 4 | References: bnc#486728 | |
| 5 | ||
| 6 | Add vendor ID for Foxconn and use it to set the ath5k LED gpio and | |
| 7 | polarity for Acer branded laptops. | |
| 8 | ||
| 9 | base.c: | |
| 10 | Changes-licensed-under: 3-Clause-BSD | |
| 11 | ||
| 12 | Reported-by: Maxim Levitsky <maximlevitsky@gmail.com> | |
| 13 | Tested-by: Maxim Levitsky <maximlevitsky@gmail.com> | |
| 14 | Tested-by: Andreas Mohr <andi@lisas.de> | |
| 15 | Signed-off-by: Bob Copeland <me@bobcopeland.com> | |
| 16 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | |
| 17 | Acked-by: Helmut Schaa <hschaa@suse.de> | |
| 18 | Acked-by: Jiri Benc <jbenc@suse.cz> | |
| 19 | ||
| 20 | --- | |
| 21 | ||
| 22 | diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c | |
| 23 | index e4fe13e..9a7072e 100644 | |
| 24 | --- a/drivers/net/wireless/ath5k/base.c | |
| 25 | +++ b/drivers/net/wireless/ath5k/base.c | |
| 26 | @@ -2593,6 +2593,13 @@ ath5k_init_leds(struct ath5k_softc *sc) | |
| 27 | sc->led_pin = 1; | |
| 28 | sc->led_on = 1; /* active high */ | |
| 29 | } | |
| 30 | + /* Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) */ | |
| 31 | + if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN) { | |
| 32 | + __set_bit(ATH_STAT_LEDSOFT, sc->status); | |
| 33 | + sc->led_pin = 3; | |
| 34 | + sc->led_on = 0; /* active low */ | |
| 35 | + } | |
| 36 | + | |
| 37 | if (!test_bit(ATH_STAT_LEDSOFT, sc->status)) | |
| 38 | goto out; | |
| 39 | ||
| 40 | diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h | |
| 41 | index aca8c45..b574815 100644 | |
| 42 | --- a/include/linux/pci_ids.h | |
| 43 | +++ b/include/linux/pci_ids.h | |
| 44 | @@ -823,6 +823,8 @@ | |
| 45 | #define PCI_DEVICE_ID_PROMISE_20276 0x5275 | |
| 46 | #define PCI_DEVICE_ID_PROMISE_20277 0x7275 | |
| 47 | ||
| 48 | +#define PCI_VENDOR_ID_FOXCONN 0x105b | |
| 49 | + | |
| 50 | #define PCI_VENDOR_ID_UMC 0x1060 | |
| 51 | #define PCI_DEVICE_ID_UMC_UM8673F 0x0101 | |
| 52 | #define PCI_DEVICE_ID_UMC_UM8886BF 0x673a |