ar71xx: move gpio-buttons support into a spearate file

[librecmc/librecmc.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tl-wr1043nd.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
index e67282e6daa84e22e0aae7b1e42eb9eef074bdc5..f36d3600e253c167ff298d13116be9deed31ffa2 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
@@ -11,18 +11,20 @@
 #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 "devices.h"
+#include "dev-m25p80.h"
+#include "dev-ar913x-wmac.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
 
+#define TL_WR1043ND_GPIO_LED_USB        1
 #define TL_WR1043ND_GPIO_LED_SYSTEM     2
 #define TL_WR1043ND_GPIO_LED_QSS        5
+#define TL_WR1043ND_GPIO_LED_WLAN       9
 
 #define TL_WR1043ND_GPIO_BTN_RESET      3
 #define TL_WR1043ND_GPIO_BTN_QSS        7
@@ -50,7 +52,7 @@ static struct mtd_partition tl_wr1043nd_partitions[] = {
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
        } , {
-               .name           = "firmware",    
+               .name           = "firmware",
                .offset         = 0x020000,
                .size           = 0x7d0000,
        }
@@ -59,29 +61,27 @@ static struct mtd_partition tl_wr1043nd_partitions[] = {
 
 static struct flash_platform_data tl_wr1043nd_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = tl_wr1043nd_partitions,
-        .nr_parts       = ARRAY_SIZE(tl_wr1043nd_partitions),
+       .parts          = tl_wr1043nd_partitions,
+       .nr_parts       = ARRAY_SIZE(tl_wr1043nd_partitions),
 #endif
 };
 
-static struct spi_board_info tl_wr1043nd_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-               .platform_data  = &tl_wr1043nd_flash_data,
-       }
-};
-
 static struct gpio_led tl_wr1043nd_leds_gpio[] __initdata = {
        {
+               .name           = "tl-wr1043nd:green:usb",
+               .gpio           = TL_WR1043ND_GPIO_LED_USB,
+               .active_low     = 1,
+       }, {
                .name           = "tl-wr1043nd:green:system",
                .gpio           = TL_WR1043ND_GPIO_LED_SYSTEM,
                .active_low     = 1,
        }, {
-               .name           = "tl-wr1043nd:red:qss",
+               .name           = "tl-wr1043nd:green:qss",
                .gpio           = TL_WR1043ND_GPIO_LED_QSS,
+               .active_low     = 0,
+       }, {
+               .name           = "tl-wr1043nd:green:wlan",
+               .gpio           = TL_WR1043ND_GPIO_LED_WLAN,
                .active_low     = 1,
        }
 };
@@ -116,13 +116,12 @@ static void __init tl_wr1043nd_setup(void)
        ar71xx_eth0_data.phy_mask = 0x0;
        ar71xx_eth0_data.speed = SPEED_1000;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
-       
+
        ar71xx_add_device_eth(0);
-       
+
        ar71xx_add_device_usb();
-       
-       ar71xx_add_device_spi(NULL, tl_wr1043nd_spi_info,
-                                       ARRAY_SIZE(tl_wr1043nd_spi_info));
+
+       ar71xx_add_device_m25p80(&tl_wr1043nd_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr1043nd_leds_gpio),
                                        tl_wr1043nd_leds_gpio);
@@ -130,7 +129,7 @@ static void __init tl_wr1043nd_setup(void)
        ar71xx_add_device_gpio_buttons(-1, TL_WR1043ND_BUTTONS_POLL_INTERVAL,
                                        ARRAY_SIZE(tl_wr1043nd_gpio_buttons),
                                        tl_wr1043nd_gpio_buttons);
-       ar91xx_add_device_wmac();
+       ar913x_add_device_wmac();
 }
 
 MIPS_MACHINE(AR71XX_MACH_TL_WR1043ND, "TP-LINK TL-WR1043ND", tl_wr1043nd_setup);