ar71xx: use COMMAND_LINE_SIZE

[openwrt/svn-archive/archive.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 1ab5584e721b1210ceaee54578441972e683f0fe..a6f1daf4619f1a974fd3f3a0bf3017191461992a 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
@@ -9,30 +9,51 @@
  *  by the Free Software Foundation.
  */
 
-#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 "machtype.h"
 #include "devices.h"
+#include "dev-m25p80.h"
+#include "dev-gpio-buttons.h"
+#include "dev-pb42-pci.h"
+#include "dev-leds-gpio.h"
+
+#define AW_NR580_GPIO_LED_READY_RED    0
+#define AW_NR580_GPIO_LED_WLAN         1
+#define AW_NR580_GPIO_LED_READY_GREEN  2
+#define AW_NR580_GPIO_LED_WPS_GREEN    4
+#define AW_NR580_GPIO_LED_WPS_AMBER    5
 
 #define AW_NR580_GPIO_BTN_WPS          3
 #define AW_NR580_GPIO_BTN_RESET                11
 
 #define AW_NR580_BUTTONS_POLL_INTERVAL 20
 
-static struct spi_board_info aw_nr580_spi_info[] = {
+static struct gpio_led aw_nr580_leds_gpio[] __initdata = {
        {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
+               .name           = "aw-nr580:red:ready",
+               .gpio           = AW_NR580_GPIO_LED_READY_RED,
+               .active_low     = 0,
+       }, {
+               .name           = "aw-nr580:green:ready",
+               .gpio           = AW_NR580_GPIO_LED_READY_GREEN,
+               .active_low     = 0,
+       }, {
+               .name           = "aw-nr580:green:wps",
+               .gpio           = AW_NR580_GPIO_LED_WPS_GREEN,
+               .active_low     = 0,
+       }, {
+               .name           = "aw-nr580:amber:wps",
+               .gpio           = AW_NR580_GPIO_LED_WPS_AMBER,
+               .active_low     = 0,
+       }, {
+               .name           = "aw-nr580:green:wlan",
+               .gpio           = AW_NR580_GPIO_LED_WLAN,
+               .active_low     = 0,
        }
 };
 
@@ -41,14 +62,14 @@ static struct gpio_button aw_nr580_gpio_buttons[] __initdata = {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = BTN_0,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = AW_NR580_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = AW_NR580_GPIO_BTN_WPS,
                .active_low     = 1,
        }
@@ -65,12 +86,17 @@ static void __init aw_nr580_setup(void)
 
        ar71xx_add_device_eth(0);
 
-       ar71xx_add_device_spi(NULL, aw_nr580_spi_info,
-                                       ARRAY_SIZE(aw_nr580_spi_info));
+       pb42_pci_init();
+
+       ar71xx_add_device_m25p80(NULL);
+
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(aw_nr580_leds_gpio),
+                                       aw_nr580_leds_gpio);
 
        ar71xx_add_device_gpio_buttons(-1, AW_NR580_BUTTONS_POLL_INTERVAL,
                                        ARRAY_SIZE(aw_nr580_gpio_buttons),
                                        aw_nr580_gpio_buttons);
 }
 
-MIPS_MACHINE(AR71XX_MACH_AW_NR580, "AzureWave AW-NR580", aw_nr580_setup);
+MIPS_MACHINE(AR71XX_MACH_AW_NR580, "AW-NR580", "AzureWave AW-NR580",
+            aw_nr580_setup);