ar71xx: build ALFA AP96 images with default profile as well

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
index 7d64fe96c6bf059eab6dab1ee538865257ab8bf2..3af42041f39d179cd47c76db287542cb79608951 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
@@ -15,17 +15,19 @@
 #include "dev-pb42-pci.h"
 #include "dev-usb.h"
 
-#define JWAP003_BUTTONS_POLL_INTERVAL  20
+#define JWAP003_KEYS_POLL_INTERVAL     20      /* msecs */
+#define JWAP003_KEYS_DEBOUNCE_INTERVAL (3 * JWAP003_KEYS_POLL_INTERVAL)
+
 #define JWAP003_GPIO_WPS       11
 #define JWAP003_GPIO_I2C_SCL   0
 #define JWAP003_GPIO_I2C_SDA   1
 
-static struct gpio_button jwap003_gpio_buttons[] __initdata = {
+static struct gpio_keys_button jwap003_gpio_keys[] __initdata = {
        {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = JWAP003_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = JWAP003_GPIO_WPS,
                .active_low     = 1,
        }
@@ -44,21 +46,32 @@ static struct platform_device jwap003_i2c_gpio_device = {
        }
 };
 
+static const char *jwap003_part_probes[] = {
+       "RedBoot",
+       NULL,
+};
+
+static struct flash_platform_data jwap003_flash_data = {
+       .part_probes    = jwap003_part_probes,
+};
+
 #define JWAP003_WAN_PHYMASK    BIT(0)
 #define JWAP003_LAN_PHYMASK    BIT(4)
 
 static void __init jwap003_init(void)
 {
-       ar71xx_add_device_m25p80(NULL);
+       ar71xx_add_device_m25p80(&jwap003_flash_data);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth0_data.phy_mask = JWAP003_WAN_PHYMASK;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
        ar71xx_eth0_data.has_ar8216 = 1;
 
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.phy_mask = JWAP003_LAN_PHYMASK;
        ar71xx_eth1_data.speed = SPEED_100;
@@ -71,9 +84,9 @@ static void __init jwap003_init(void)
 
        ar71xx_add_device_usb();
 
-       ar71xx_add_device_gpio_buttons(-1, JWAP003_BUTTONS_POLL_INTERVAL,
-                                      ARRAY_SIZE(jwap003_gpio_buttons),
-                                      jwap003_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, JWAP003_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(jwap003_gpio_keys),
+                                        jwap003_gpio_keys);
 
        pb42_pci_init();
 }