1 files changed, 25 insertions, 18 deletions

diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c
index 3c311a539347..4a3c60694c75 100644
--- a/arch/mips/ath79/mach-ubnt-xm.c
+++ b/arch/mips/ath79/mach-ubnt-xm.c
@@ -12,16 +12,15 @@
 
 #include <linux/init.h>
 #include <linux/pci.h>
-
-#ifdef CONFIG_PCI
 #include <linux/ath9k_platform.h>
-#include <asm/mach-ath79/pci-ath724x.h>
-#endif /* CONFIG_PCI */
+
+#include <asm/mach-ath79/irq.h>
 
 #include "machtypes.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-spi.h"
+#include "pci.h"
 
 #define UBNT_XM_GPIO_LED_L1             0
 #define UBNT_XM_GPIO_LED_L2             1
@@ -33,7 +32,6 @@
 #define UBNT_XM_KEYS_POLL_INTERVAL      20
 #define UBNT_XM_KEYS_DEBOUNCE_INTERVAL  (3 * UBNT_XM_KEYS_POLL_INTERVAL)
 
-#define UBNT_XM_PCI_IRQ                 48
 #define UBNT_XM_EEPROM_ADDR             (u8 *) KSEG1ADDR(0x1fff1000)
 
 static struct gpio_led ubnt_xm_leds_gpio[] __initdata = {
@@ -84,12 +82,27 @@ static struct ath79_spi_platform_data ubnt_xm_spi_data = {
 #ifdef CONFIG_PCI
 static struct ath9k_platform_data ubnt_xm_eeprom_data;
 
-static struct ath724x_pci_data ubnt_xm_pci_data[] = {
-        {
-                .irq    = UBNT_XM_PCI_IRQ,
-                .pdata  = &ubnt_xm_eeprom_data,
-        },
-};
+static int ubnt_xm_pci_plat_dev_init(struct pci_dev *dev)
+{
+        switch (PCI_SLOT(dev->devfn)) {
+        case 0:
+                dev->dev.platform_data = &ubnt_xm_eeprom_data;
+                break;
+        }
+
+        return 0;
+}
+
+static void __init ubnt_xm_pci_init(void)
+{
+        memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,
+               sizeof(ubnt_xm_eeprom_data.eeprom_data));
+
+        ath79_pci_set_plat_dev_init(ubnt_xm_pci_plat_dev_init);
+        ath79_register_pci();
+}
+#else
+static inline void ubnt_xm_pci_init(void) {}
 #endif /* CONFIG_PCI */
 
 static void __init ubnt_xm_init(void)
@@ -104,13 +117,7 @@ static void __init ubnt_xm_init(void)
         ath79_register_spi(&ubnt_xm_spi_data, ubnt_xm_spi_info,
                            ARRAY_SIZE(ubnt_xm_spi_info));
 
-#ifdef CONFIG_PCI
-        memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,
-               sizeof(ubnt_xm_eeprom_data.eeprom_data));
-
-        ath724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data));
-#endif /* CONFIG_PCI */
-
+        ubnt_xm_pci_init();
 }
 
 MIPS_MACHINE(ATH79_MACH_UBNT_XM,