ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.c b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.c
index f24d4697c16c75b51be9e63c1e9f39ca6f02b1ec..2b75f7bcb73c321b5cc094acb146f4e8d80b86ce 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-ap91-pci.c
@@ -16,10 +16,12 @@
 #include <asm/mach-ar71xx/pci.h>
 
 #include "dev-ap91-pci.h"
+#include "pci-ath9k-fixup.h"
 
-static struct ath9k_platform_data ap91_wmac_data;
+static struct ath9k_platform_data ap91_wmac_data = {
+       .led_pin = -1,
+};
 static char ap91_wmac_mac[6];
-static int ap91_pci_fixup_enabled;
 
 static struct ar71xx_pci_irq ap91_pci_irqs[] __initdata = {
        {
@@ -31,7 +33,7 @@ static struct ar71xx_pci_irq ap91_pci_irqs[] __initdata = {
 
 static int ap91_pci_plat_dev_init(struct pci_dev *dev)
 {
-       switch(PCI_SLOT(dev->devfn)) {
+       switch (PCI_SLOT(dev->devfn)) {
        case 0:
                dev->dev.platform_data = &ap91_wmac_data;
                break;
@@ -40,74 +42,16 @@ static int ap91_pci_plat_dev_init(struct pci_dev *dev)
        return 0;
 }
 
-static void ap91_pci_fixup(struct pci_dev *dev)
+__init void ap91_pci_setup_wmac_led_pin(int pin)
 {
-       void __iomem *mem;
-       u16 *cal_data;
-       u16 cmd;
-       u32 val;
-
-       if (!ap91_pci_fixup_enabled)
-               return;
-
-       printk(KERN_INFO "PCI: fixup device %s\n", pci_name(dev));
-
-       cal_data = ap91_wmac_data.eeprom_data;
-       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;
-       }
-
-       /* Setup the PCI device to allow access to the internal registers */
-       switch (ar71xx_soc) {
-       case AR71XX_SOC_AR7240:
-               pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, 0xffff);
-               break;
-
-       case AR71XX_SOC_AR7241:
-       case AR71XX_SOC_AR7242:
-               pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, 0x1000ffff);
-               break;
-
-       default:
-               BUG();
-       }
-
-       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 */
+       ap91_wmac_data.led_pin = pin;
+}
 
-       iounmap(mem);
+__init void ap91_pci_setup_wmac_gpio(u32 mask, u32 val)
+{
+       ap91_wmac_data.gpio_mask = mask;
+       ap91_wmac_data.gpio_val = val;
 }
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ap91_pci_fixup);
 
 void __init ap91_pci_init(u8 *cal_data, u8 *mac_addr)
 {
@@ -123,5 +67,5 @@ void __init ap91_pci_init(u8 *cal_data, u8 *mac_addr)
        ar71xx_pci_plat_dev_init = ap91_pci_plat_dev_init;
        ar71xx_pci_init(ARRAY_SIZE(ap91_pci_irqs), ap91_pci_irqs);
 
-       ap91_pci_fixup_enabled = 1;
+       pci_enable_ath9k_fixup(0, ap91_wmac_data.eeprom_data);
 }