ar71xx: improve the wndr3700 quirks - move most of the code out of ath9k and instead...

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / dev-ap94-pci.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap94-pci.c b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap94-pci.c
index 920ab6c7258de72ddecc4b527aeb876fb520a7a9..1fd40bb62803a828b4ac25d09529a3c676cd402c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap94-pci.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap94-pci.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AP94 reference board PCI initialization
  *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
@@ -16,12 +16,16 @@
 #include <asm/mach-ar71xx/pci.h>
 
 #include "dev-ap94-pci.h"
+#include "pci-ath9k-fixup.h"
 
-static struct ath9k_platform_data ap94_wmac0_data;
-static struct ath9k_platform_data ap94_wmac1_data;
+static struct ath9k_platform_data ap94_wmac0_data = {
+       .led_pin = -1,
+};
+static struct ath9k_platform_data ap94_wmac1_data = {
+       .led_pin = -1,
+};
 static char ap94_wmac0_mac[6];
 static char ap94_wmac1_mac[6];
-static int ap94_pci_fixup_enabled;
 
 static struct ar71xx_pci_irq ap94_pci_irqs[] __initdata = {
         {
@@ -50,80 +54,20 @@ static int ap94_pci_plat_dev_init(struct pci_dev *dev)
        return 0;
 }
 
-static void ap94_pci_fixup(struct pci_dev *dev)
+void __init ap94_pci_enable_quirk_wndr3700(void)
 {
-       void __iomem *mem;
-       u16 *cal_data;
-       u16 cmd;
-       u32 bar0;
-       u32 val;
-
-       if (!ap94_pci_fixup_enabled)
-               return;
-
-       switch (PCI_SLOT(dev->devfn)) {
-       case 17:
-               cal_data = ap94_wmac0_data.eeprom_data;
-               break;
-       case 18:
-               cal_data = ap94_wmac1_data.eeprom_data;
-               break;
-       default:
-               return;
-       }
-
-       if (*cal_data != 0xa55a) {
-               printk(KERN_ERR "PCI: no calibration data found for %s\n",
-                      pci_name(dev));
-               return;
-       }
-
-       mem = ioremap(AR71XX_PCI_MEM_BASE, 0x10000);
-       if (!mem) {
-               printk(KERN_ERR "PCI: ioremap error for device %s\n",
-                      pci_name(dev));
-               return;
-       }
-
-       printk(KERN_INFO "PCI: fixup device %s\n", pci_name(dev));
-
-       pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0);
-
-       /* Setup the PCI device to allow access to the internal registers */
-       pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, AR71XX_PCI_MEM_BASE);
-       pci_read_config_word(dev, PCI_COMMAND, &cmd);
-       cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
-       pci_write_config_word(dev, PCI_COMMAND, cmd);
-
-       /* set pointer to first reg address */
-       cal_data += 3;
-       while (*cal_data != 0xffff) {
-               u32 reg;
-               reg = *cal_data++;
-               val = *cal_data++;
-               val |= (*cal_data++) << 16;
-
-               __raw_writel(val, mem + reg);
-               udelay(100);
-       }
-
-       pci_read_config_dword(dev, PCI_VENDOR_ID, &val);
-       dev->vendor = val & 0xffff;
-       dev->device = (val >> 16) & 0xffff;
-
-       pci_read_config_dword(dev, PCI_CLASS_REVISION, &val);
-       dev->revision = val & 0xff;
-       dev->class = val >> 8; /* upper 3 bytes */
-
-       pci_read_config_word(dev, PCI_COMMAND, &cmd);
-       cmd &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
-       pci_write_config_word(dev, PCI_COMMAND, cmd);
+       /* WNDR3700 uses GPIO 6-9 for antenna configuration */
 
-       pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0);
+       ap94_wmac0_data.led_pin = 5;
+       ap94_wmac0_data.gpio_mask = (0xf << 6);
+       /* 2.4 GHz uses the first fixed antenna group (0, 1, 0, 1) */
+       ap94_wmac0_data.gpio_val = (5 << 6);
 
-       iounmap(mem);
+       ap94_wmac1_data.led_pin = 5;
+       ap94_wmac1_data.gpio_mask = (0xf << 6);
+       /* 5 GHz uses the second fixed antenna group (0, 1, 1, 0) */
+       ap94_wmac1_data.gpio_val = (6 << 6);
 }
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ap94_pci_fixup);
 
 void __init ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
                          u8 *cal_data1, u8 *mac_addr1)
@@ -149,5 +93,6 @@ void __init ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
        ar71xx_pci_plat_dev_init = ap94_pci_plat_dev_init;
        ar71xx_pci_init(ARRAY_SIZE(ap94_pci_irqs), ap94_pci_irqs);
 
-       ap94_pci_fixup_enabled = 1;
+       pci_enable_ath9k_fixup(17, ap94_wmac0_data.eeprom_data);
+       pci_enable_ath9k_fixup(18, ap94_wmac1_data.eeprom_data);
 }