ar71xx: build ALFA AP96 images with default profile as well

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
index 35860260c98e533d3487f65c6ffcbb4358ff5b83..6d8d55fafa9b4a8b0a7757cf2dc584f066c72b16 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
@@ -21,15 +21,16 @@
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 
-#define WRT400N_GPIO_LED_ORANGE        5
-#define WRT400N_GPIO_LED_GREEN 4
-#define WRT400N_GPIO_LED_POWER 1
-#define WRT400N_GPIO_LED_WLAN  0
+#define WRT400N_GPIO_LED_POWER         1
+#define WRT400N_GPIO_LED_WPS_BLUE      4
+#define WRT400N_GPIO_LED_WPS_AMBER     5
+#define WRT400N_GPIO_LED_WLAN          6
 
 #define WRT400N_GPIO_BTN_RESET 8
 #define WRT400N_GPIO_BTN_WLSEC 3
 
-#define WRT400N_BUTTONS_POLL_INTERVAL  20
+#define WRT400N_KEYS_POLL_INTERVAL     20      /* msecs */
+#define WRT400N_KEYS_DEBOUNE_INTERVAL  (3 * WRT400N_KEYS_POLL_INTERVAL)
 
 #define WRT400N_MAC_ADDR_OFFSET                0x120c
 #define WRT400N_CALDATA0_OFFSET                0x1000
@@ -92,37 +93,38 @@ static struct flash_platform_data wrt400n_flash_data = {
 
 static struct gpio_led wrt400n_leds_gpio[] __initdata = {
        {
-               .name           = "wrt400n:green:status",
-               .gpio           = WRT400N_GPIO_LED_GREEN,
+               .name           = "wrt400n:blue:wps",
+               .gpio           = WRT400N_GPIO_LED_WPS_BLUE,
                .active_low     = 1,
        }, {
-               .name           = "wrt400n:amber:aoss",
-               .gpio           = WRT400N_GPIO_LED_ORANGE,
+               .name           = "wrt400n:amber:wps",
+               .gpio           = WRT400N_GPIO_LED_WPS_AMBER,
                .active_low     = 1,
        }, {
-               .name           = "wrt400n:green:wlan",
+               .name           = "wrt400n:blue:wlan",
                .gpio           = WRT400N_GPIO_LED_WLAN,
                .active_low     = 1,
        }, {
-               .name           = "wrt400n:green:power",
+               .name           = "wrt400n:blue:power",
                .gpio           = WRT400N_GPIO_LED_POWER,
-               .active_low     = 1,
+               .active_low     = 0,
+               .default_trigger = "default-on",
        }
 };
 
-static struct gpio_button wrt400n_gpio_buttons[] __initdata = {
+static struct gpio_keys_button wrt400n_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = WRT400N_KEYS_DEBOUNE_INTERVAL,
                .gpio           = WRT400N_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wlsec",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = WRT400N_KEYS_DEBOUNE_INTERVAL,
                .gpio           = WRT400N_GPIO_BTN_WLSEC,
                .active_low     = 1,
        }
@@ -133,7 +135,7 @@ static void __init wrt400n_setup(void)
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
        u8 *mac = art + WRT400N_MAC_ADDR_OFFSET;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 1);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
@@ -152,9 +154,9 @@ static void __init wrt400n_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wrt400n_leds_gpio),
                                        wrt400n_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, WRT400N_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(wrt400n_gpio_buttons),
-                                       wrt400n_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, WRT400N_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(wrt400n_gpio_keys),
+                                        wrt400n_gpio_keys);
 
        ap94_pci_init(art + WRT400N_CALDATA0_OFFSET, NULL,
                      art + WRT400N_CALDATA1_OFFSET, NULL);