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

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-ubnt.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index 0653c2f03733529abda34543dcf47375736bb69e..5182cbfc45fba06922be1f461f1420e0b56b3e64 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -12,8 +12,6 @@
 
 #include <linux/pci.h>
 #include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
 #include <linux/input.h>
 #include <linux/ath9k_platform.h>
 
@@ -22,6 +20,7 @@
 #include <asm/mach-ar71xx/pci.h>
 
 #include "devices.h"
+#include "dev-m25p80.h"
 
 #define UBNT_RS_GPIO_LED_RF    2
 #define UBNT_RS_GPIO_SW4       8
@@ -42,15 +41,6 @@
 
 #define UBNT_BUTTONS_POLL_INTERVAL     20
 
-static struct spi_board_info ubnt_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-       }
-};
-
 static struct ar71xx_pci_irq ubnt_pci_irqs[] __initdata = {
        {
                .slot   = 0,
@@ -151,8 +141,7 @@ static struct gpio_button ubnt_m_gpio_buttons[] __initdata = {
 
 static void __init ubnt_generic_setup(void)
 {
-       ar71xx_add_device_spi(NULL, ubnt_spi_info,
-                                   ARRAY_SIZE(ubnt_spi_info));
+       ar71xx_add_device_m25p80(NULL);
 
        ar71xx_add_device_gpio_buttons(-1, UBNT_BUTTONS_POLL_INTERVAL,
                                        ARRAY_SIZE(ubnt_gpio_buttons),
@@ -285,16 +274,17 @@ static void __init ubnt_m_setup(void)
 
        ar71xx_set_mac_base(mac);
 
-       ar71xx_add_device_spi(NULL, ubnt_spi_info,
-                                   ARRAY_SIZE(ubnt_spi_info));
+       ar71xx_add_device_m25p80(NULL);
 
        ar71xx_add_device_mdio(~0);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
        ar71xx_eth0_data.phy_mask = 0;
-
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
+       ar71xx_eth0_data.fifo_cfg1 = 0x0010ffff;
+       ar71xx_eth0_data.fifo_cfg2 = 0x015500aa;
+       ar71xx_eth0_data.fifo_cfg3 = 0x01f00140;
 
        ar71xx_add_device_eth(0);
 
@@ -308,8 +298,14 @@ static void __init ubnt_m_setup(void)
                                        ubnt_m_gpio_buttons);
 }
 
+static void __init ubnt_rocket_m_setup(void)
+{
+       ubnt_m_setup();
+       ar71xx_add_device_usb();
+}
+
 MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "Ubiquiti Bullet M", ubnt_m_setup);
-MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "Ubiquiti Rocket M", ubnt_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "Ubiquiti Rocket M", ubnt_rocket_m_setup);
 
 /* TODO detect the second ethernet port and use one
    init function for all Ubiquiti MIMO series products */
@@ -319,9 +315,11 @@ static void __init ubnt_nano_m_setup(void)
 
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.phy_mask = 0;
-
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
+       ar71xx_eth1_data.fifo_cfg1 = 0x0010ffff;
+       ar71xx_eth1_data.fifo_cfg2 = 0x015500aa;
+       ar71xx_eth1_data.fifo_cfg3 = 0x01f00140;
 
        ar71xx_add_device_eth(1);
 }