ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
index 04f995c09a75f76e61b62c0f8822c4d0ab484eee..59802d4b8db3d2dfdf26906cb885cd1d99bb2264 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
@@ -10,7 +10,6 @@
 
 #include <linux/init.h>
 #include <linux/bitops.h>
-#include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
@@ -20,11 +19,14 @@
 #include <linux/i2c-gpio.h>
 #include <linux/i2c/pcf857x.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-pb42-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
 
 #define PB44_PCF8757_VSC7395_CS        0
 #define PB44_PCF8757_STEREO_CS 1
@@ -52,21 +54,8 @@
 #define PB44_GPIO_LED_JUMP1    (PB44_GPIO_EXP_BASE + PB44_PCF8757_LED_JUMP1)
 #define PB44_GPIO_LED_JUMP2    (PB44_GPIO_EXP_BASE + PB44_PCF8757_LED_JUMP2)
 
-static struct ar71xx_pci_irq pb44_pci_irqs[] __initdata = {
-       {
-               .slot   = 0,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV0,
-       }, {
-               .slot   = 1,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV1,
-       }, {
-               .slot   = 2,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV2,
-       }
-};
+#define PB44_KEYS_POLL_INTERVAL                20      /* msecs */
+#define PB44_KEYS_DEBOUNCE_INTERVAL    (3 * PB44_KEYS_POLL_INTERVAL)
 
 static struct i2c_gpio_platform_data pb44_i2c_gpio_data = {
        .sda_pin        = PB44_GPIO_I2C_SDA,
@@ -104,19 +93,19 @@ static struct gpio_led pb44_leds_gpio[] __initdata = {
        },
 };
 
-static struct gpio_button pb44_gpio_buttons[] __initdata = {
+static struct gpio_keys_button pb44_gpio_keys[] __initdata = {
        {
                .desc           = "soft_reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .debounce_interval = PB44_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = PB44_GPIO_SW_RESET,
                .active_low     = 1,
-       } , {
+       }, {
                .desc           = "jumpstart",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .debounce_interval = PB44_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = PB44_GPIO_SW_JUMP,
                .active_low     = 1,
        }
@@ -187,13 +176,14 @@ static void __init pb44_init(void)
 {
        ar71xx_add_device_mdio(~PB44_MDIO_PHYMASK);
 
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth0_data.phy_mask = PB44_WAN_PHYMASK;
 
        ar71xx_add_device_eth(0);
 
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-       ar71xx_eth1_data.phy_mask = PB44_LAN_PHYMASK;
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
        ar71xx_eth1_pll_data.pll_1000 = 0x110000;
@@ -202,10 +192,10 @@ static void __init pb44_init(void)
 
        ar71xx_add_device_usb();
 
-       ar71xx_pci_init(ARRAY_SIZE(pb44_pci_irqs), pb44_pci_irqs);
+       pb42_pci_init();
 
        i2c_register_board_info(0, pb44_i2c_board_info,
-                               ARRAY_SIZE(pb44_i2c_board_info));
+                               ARRAY_SIZE(pb44_i2c_board_info));
 
        platform_device_register(&pb44_i2c_gpio_device);
 
@@ -213,10 +203,11 @@ static void __init pb44_init(void)
        platform_device_register(&pb44_spi_device);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(pb44_leds_gpio),
-                                   pb44_leds_gpio);
+                                       pb44_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, 20, ARRAY_SIZE(pb44_gpio_buttons),
-                                      pb44_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, PB44_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(pb44_gpio_keys),
+                                        pb44_gpio_keys);
 }
 
-MIPS_MACHINE(AR71XX_MACH_PB44, "Atheros PB44", pb44_init);
+MIPS_MACHINE(AR71XX_MACH_PB44, "PB44", "Atheros PB44", pb44_init);