ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
index 5ecc47390c9bca64d226bfb3caa98aaa10f32c36..84fb184c0bc424343050654e9d46c28ff0bec58b 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
@@ -29,17 +29,18 @@
 #define DIR825B1_GPIO_LED_BLUE_USB             0
 #define DIR825B1_GPIO_LED_ORANGE_POWER         1
 #define DIR825B1_GPIO_LED_BLUE_POWER           2
-#define DIR825B1_GPIO_LED_BLUE_POWERSAVE       4
+#define DIR825B1_GPIO_LED_BLUE_WPS             4
 #define DIR825B1_GPIO_LED_ORANGE_PLANET                6
 #define DIR825B1_GPIO_LED_BLUE_PLANET          11
 
 #define DIR825B1_GPIO_BTN_RESET                        3
-#define DIR825B1_GPIO_BTN_POWERSAVE            8
+#define DIR825B1_GPIO_BTN_WPS                  8
 
 #define DIR825B1_GPIO_RTL8366_SDA              5
 #define DIR825B1_GPIO_RTL8366_SCK              7
 
-#define DIR825B1_BUTTONS_POLL_INTERVAL         20
+#define DIR825B1_KEYS_POLL_INTERVAL            20      /* msecs */
+#define DIR825B1_KEYS_DEBOUNCE_INTERVAL                (3 * DIR825B1_KEYS_POLL_INTERVAL)
 
 #define DIR825B1_CAL_LOCATION_0                        0x1f661000
 #define DIR825B1_CAL_LOCATION_1                        0x1f665000
@@ -98,8 +99,8 @@ static struct gpio_led dir825b1_leds_gpio[] __initdata = {
                .gpio           = DIR825B1_GPIO_LED_BLUE_POWER,
                .active_low     = 1,
        }, {
-               .name           = "dir825b1:blue:powersave",
-               .gpio           = DIR825B1_GPIO_LED_BLUE_POWERSAVE,
+               .name           = "dir825b1:blue:wps",
+               .gpio           = DIR825B1_GPIO_LED_BLUE_WPS,
                .active_low     = 1,
        }, {
                .name           = "dir825b1:orange:planet",
@@ -112,27 +113,33 @@ static struct gpio_led dir825b1_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button dir825b1_gpio_buttons[] __initdata = {
+static struct gpio_keys_button dir825b1_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = DIR825B1_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = DIR825B1_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
-               .desc           = "powersave",
+               .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 3,
-               .gpio           = DIR825B1_GPIO_BTN_POWERSAVE,
+               .code           = KEY_WPS_BUTTON,
+               .debounce_interval = DIR825B1_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = DIR825B1_GPIO_BTN_WPS,
                .active_low     = 1,
        }
 };
 
+static struct rtl8366s_initval dir825b1_rtl8366s_initvals[] = {
+       { .reg = 0x06, .val = 0x0108 },
+};
+
 static struct rtl8366s_platform_data dir825b1_rtl8366s_data = {
-       .gpio_sda        = DIR825B1_GPIO_RTL8366_SDA,
-       .gpio_sck        = DIR825B1_GPIO_RTL8366_SCK,
+       .gpio_sda       = DIR825B1_GPIO_RTL8366_SDA,
+       .gpio_sck       = DIR825B1_GPIO_RTL8366_SCK,
+       .num_initvals   = ARRAY_SIZE(dir825b1_rtl8366s_initvals),
+       .initvals       = dir825b1_rtl8366s_initvals,
 };
 
 static struct platform_device dir825b1_rtl8366s_device = {
@@ -156,7 +163,7 @@ static void __init dir825b1_setup(void)
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
        ar71xx_eth0_pll_data.pll_1000 = 0x11110000;
 
-       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 2);
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 2);
        ar71xx_eth1_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth1_data.phy_mask = 0x10;
@@ -170,14 +177,17 @@ static void __init dir825b1_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(dir825b1_leds_gpio),
                                        dir825b1_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, DIR825B1_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(dir825b1_gpio_buttons),
-                                       dir825b1_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, DIR825B1_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(dir825b1_gpio_keys),
+                                        dir825b1_gpio_keys);
 
        ar71xx_add_device_usb();
 
        platform_device_register(&dir825b1_rtl8366s_device);
 
+       ap94_pci_setup_wmac_led_pin(0, 5);
+       ap94_pci_setup_wmac_led_pin(1, 5);
+
        ap94_pci_init((u8 *) KSEG1ADDR(DIR825B1_CAL_LOCATION_0),
                      (u8 *) KSEG1ADDR(DIR825B1_MAC_LOCATION_0),
                      (u8 *) KSEG1ADDR(DIR825B1_CAL_LOCATION_1),