Add vendor ID for AMBIT and use it to set the ath5k LED gpio.
base.c:
Changes-licensed-under: 3-Clause-BSD
Signed-off-by: Tulio Magno Quites Machado Filho <[email protected]>
---
drivers/net/wireless/ath5k/base.c | 8 ++++++--
include/linux/pci_ids.h | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 57971a9..180518c 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -2626,8 +2626,12 @@ ath5k_init_leds(struct ath5k_softc *sc)
sc->led_pin = 1;
sc->led_on = 1; /* active high */
}
- /* Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) */
- if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN) {
+ /*
+ * Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) and
+ * in emachines notebooks with AMBIT subsystem.
+ */
+ if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN ||
+ pdev->subsystem_vendor == PCI_VENDOR_ID_AMBIT) {
__set_bit(ATH_STAT_LEDSOFT, sc->status);
sc->led_pin = 3;
sc->led_on = 0; /* active low */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 02e6046..402ab74 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -836,6 +836,8 @@
#define PCI_VENDOR_ID_FOXCONN 0x105b
+#define PCI_VENDOR_ID_AMBIT 0x1468
+
#define PCI_VENDOR_ID_UMC 0x1060
#define PCI_DEVICE_ID_UMC_UM8673F 0x0101
#define PCI_DEVICE_ID_UMC_UM8886BF 0x673a
--
1.6.0.2
On Sun, Jan 25, 2009 at 10:20 PM, Bob Copeland <[email protected]> wrote:
> Can you put the vendor id in order? The file is supposed to be
> sorted by vendor id, then by device id in order to reduce merge
> conflicts.
Sorry... I haven't seen that.
After the changes, should I submit them as a new mail? And to all lists?
> With that change, feel free to add my:
>
> Acked-by: Bob Copeland <[email protected]>
Ok!
Thanks,
--
Tulio Magno
On Sun, Jan 25, 2009 at 09:14:21PM +0100, Tulio Magno Quites Machado Filho wrote:
> Add vendor ID for AMBIT and use it to set the ath5k LED gpio.
Thanks!
> #define PCI_VENDOR_ID_FOXCONN 0x105b
>
> +#define PCI_VENDOR_ID_AMBIT 0x1468
> +
Can you put the vendor id in order? The file is supposed to be
sorted by vendor id, then by device id in order to reduce merge
conflicts.
With that change, feel free to add my:
Acked-by: Bob Copeland <[email protected]>
--
Bob Copeland %% http://www.bobcopeland.com
On Sun, Jan 25, 2009 at 10:33:54PM +0100, Tulio Magno Quites Machado Filho wrote:
> Sorry... I haven't seen that.
> After the changes, should I submit them as a new mail? And to all lists?
Sure, just resend the whole, corrected patch to everyone. For small
changes like this, you can make a note of it before the diffstat like
so:
Signed-off-by: ...
---
v2: fixed order of pci_ids.h
drivers/net/wireless/ath5k/base.c | 8 ++++++--
include/linux/pci_ids.h | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff ...
Anything between that first '---' and the patch gets thrown away when
the patch is applied, but it helps upstream (John) know what changed.
--
Bob Copeland %% http://www.bobcopeland.com