ar71xx: move PB42 specific PCI init code into a separate file

[openwrt-10.03/.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-aw-nr580.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
index 1e8c2baec986f4303d9379ca498c1076f7461fd9..859bcae5d6fdf5ed11cfe523c4a7006f4d6d9d31 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
@@ -12,15 +12,14 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
 #include <linux/input.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/pci.h>
 
 #include "devices.h"
+#include "dev-m25p80.h"
+#include "dev-pb42-pci.h"
 
 #define AW_NR580_GPIO_LED_READY_RED    0
 #define AW_NR580_GPIO_LED_WLAN         1
@@ -33,15 +32,6 @@
 
 #define AW_NR580_BUTTONS_POLL_INTERVAL 20
 
-static struct spi_board_info aw_nr580_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-       }
-};
-
 static struct gpio_led aw_nr580_leds_gpio[] __initdata = {
        {
                .name           = "aw-nr580:red:ready",
@@ -84,14 +74,6 @@ static struct gpio_button aw_nr580_gpio_buttons[] __initdata = {
        }
 };
 
-static struct ar71xx_pci_irq aw_nr580_pci_irqs[] __initdata = {
-       {
-               .slot   = 1,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV1,
-       }
-};
-
 static void __init aw_nr580_setup(void)
 {
        ar71xx_add_device_mdio(0x0);
@@ -103,10 +85,9 @@ static void __init aw_nr580_setup(void)
 
        ar71xx_add_device_eth(0);
 
-       ar71xx_pci_init(ARRAY_SIZE(aw_nr580_pci_irqs), aw_nr580_pci_irqs);
+       pb42_pci_init();
 
-       ar71xx_add_device_spi(NULL, aw_nr580_spi_info,
-                                       ARRAY_SIZE(aw_nr580_spi_info));
+       ar71xx_add_device_m25p80(NULL);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(aw_nr580_leds_gpio),
                                        aw_nr580_leds_gpio);