ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-ap81.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
index 6fa950f70d605c1694704735e893a4c82d92968b..66c57ed308eeee706c75235c916a14f8e1a1ad42 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
@@ -17,7 +17,7 @@
 #include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
-#include "dev-ar913x-wmac.h"
+#include "dev-ar9xxx-wmac.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-usb.h"
@@ -30,7 +30,8 @@
 #define AP81_GPIO_BTN_SW4      12
 #define AP81_GPIO_BTN_SW1      21
 
-#define AP81_BUTTONS_POLL_INTERVAL     20
+#define AP81_KEYS_POLL_INTERVAL                20 /* msecs */
+#define AP81_KEYS_DEBOUNCE_INTERVAL    (3 * AP81_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition ap81_partitions[] = {
@@ -39,19 +40,19 @@ static struct mtd_partition ap81_partitions[] = {
                .offset         = 0,
                .size           = 0x040000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "u-boot-env",
                .offset         = 0x040000,
                .size           = 0x010000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x050000,
                .size           = 0x500000,
-       } , {
+       }, {
                .name           = "uImage",
                .offset         = 0x550000,
                .size           = 0x100000,
-       } , {
+       }, {
                .name           = "ART",
                .offset         = 0x650000,
                .size           = 0x1b0000,
@@ -62,8 +63,8 @@ static struct mtd_partition ap81_partitions[] = {
 
 static struct flash_platform_data ap81_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = ap81_partitions,
-        .nr_parts       = ARRAY_SIZE(ap81_partitions),
+       .parts          = ap81_partitions,
+       .nr_parts       = ARRAY_SIZE(ap81_partitions),
 #endif
 };
 
@@ -87,19 +88,19 @@ static struct gpio_led ap81_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button ap81_gpio_buttons[] __initdata = {
+static struct gpio_keys_button ap81_gpio_keys[] __initdata = {
        {
                .desc           = "sw1",
                .type           = EV_KEY,
                .code           = BTN_0,
-               .threshold      = 3,
+               .debounce_interval = AP81_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = AP81_GPIO_BTN_SW1,
                .active_low     = 1,
-       } , {
+       }, {
                .desc           = "sw4",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 3,
+               .debounce_interval = AP81_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = AP81_GPIO_BTN_SW4,
                .active_low     = 1,
        }
@@ -109,15 +110,15 @@ static void __init ap81_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_set_mac_base(eeprom);
        ar71xx_add_device_mdio(0x0);
 
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0xf;
        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, eeprom, 1);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.phy_mask = 0x10;
 
@@ -131,11 +132,11 @@ static void __init ap81_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ap81_leds_gpio),
                                        ap81_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, AP81_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(ap81_gpio_buttons),
-                                       ap81_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, AP81_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(ap81_gpio_keys),
+                                        ap81_gpio_keys);
 
-       ar913x_add_device_wmac(eeprom, NULL);
+       ar9xxx_add_device_wmac(eeprom, NULL);
 }
 
 MIPS_MACHINE(AR71XX_MACH_AP81, "AP81", "Atheros AP81", ap81_setup);