ar71xx: move gpio-buttons support into a spearate file

[librecmc/librecmc.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 371ac0fc317da668ed060e2107b2095d7aac7a2a..5ad59943d8011fc143b645b773eb4c14d3a47ec1 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,16 +12,16 @@
 
 #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>
 
 #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-ap91-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-pb42-pci.h"
+#include "dev-leds-gpio.h"
 
 #define UBNT_RS_GPIO_LED_RF    2
 #define UBNT_RS_GPIO_SW4       8
@@ -42,31 +42,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,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV0,
-       }, {
-               .slot   = 1,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV1,
-       }, {
-               .slot   = 2,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV2,
-       }
-};
-
 static struct gpio_led ubnt_rs_leds_gpio[] __initdata = {
        {
                .name           = "ubnt:green:rf",
@@ -151,14 +126,13 @@ 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),
                                        ubnt_gpio_buttons);
 
-       ar71xx_pci_init(ARRAY_SIZE(ubnt_pci_irqs), ubnt_pci_irqs);
+       pb42_pci_init();
 }
 
 #define UBNT_RS_WAN_PHYMASK    (1 << 20)
@@ -246,47 +220,14 @@ static void __init ubnt_lssr71_setup(void)
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "Ubiquiti LS-SR71", ubnt_lssr71_setup);
 
-#ifdef CONFIG_PCI
-static struct ar71xx_pci_irq ubnt_m_pci_irqs[] __initdata = {
-       {
-               .slot   = 0,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV0,
-       }
-};
-
-static struct ath9k_platform_data ubnt_m_wmac_data;
-
-static int ubmnt_m_pci_plat_dev_init(struct pci_dev *dev)
-{
-       dev->dev.platform_data = &ubnt_m_wmac_data;
-       return 0;
-}
-
-static void __init ubnt_m_pci_init(void)
-{
-       u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
-       memcpy(ubnt_m_wmac_data.eeprom_data, ee,
-              sizeof(ubnt_m_wmac_data.eeprom_data));
-
-       ar71xx_pci_plat_dev_init = ubmnt_m_pci_plat_dev_init;
-
-       ar71xx_pci_init(ARRAY_SIZE(ubnt_m_pci_irqs),
-                       ubnt_m_pci_irqs);
-}
-#else
-static inline void ubnt_m_pci_init(void) { };
-#endif /* CONFIG_PCI */
-
 static void __init ubnt_m_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+       u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
        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);
 
@@ -300,7 +241,7 @@ static void __init ubnt_m_setup(void)
 
        ar71xx_add_device_eth(0);
 
-       ubnt_m_pci_init();
+       ap91_pci_init(ee, NULL);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_m_leds_gpio),
                                        ubnt_m_leds_gpio);