ar71xx: Buffalo WHR-HP-G300N kernel support

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
index 2806f3bf28e87ae108abac32c46cf8ca1fb99423..9a1fbea391fa7d40a2dca95eaa407fd350cffbf5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c
@@ -12,8 +12,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/nxp_74hc153.h>
-#include <linux/rtl8366s.h>
-#include <linux/rtl8366rb.h>
+#include <linux/rtl8366.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
@@ -49,7 +48,8 @@
 #define WZRHPG300NH_GPIO_BTN_ROUTER_AUTO (WZRHPG300NH_GPIO_EXP_BASE + 6)
 #define WZRHPG300NH_GPIO_BTN_QOS_OFF   (WZRHPG300NH_GPIO_EXP_BASE + 7)
 
-#define WZRHPG300NH_BUTTONS_POLL_INTERVAL      20
+#define WZRHPG300NH_KEYS_POLL_INTERVAL 20      /* msecs */
+#define WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPG300NH_KEYS_POLL_INTERVAL)
 
 #define WZRHPG300NH_MAC_OFFSET         0x20c
 
@@ -144,54 +144,54 @@ static struct gpio_led wzrhpg300nh_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button wzrhpg300nh_gpio_buttons[] __initdata = {
+static struct gpio_keys_button wzrhpg300nh_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WZRHPG300NH_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "aoss",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WZRHPG300NH_GPIO_BTN_AOSS,
                .active_low     = 1,
        }, {
                .desc           = "usb",
                .type           = EV_KEY,
                .code           = BTN_2,
-               .threshold      = 3,
+               .debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WZRHPG300NH_GPIO_BTN_USB,
                .active_low     = 1,
        }, {
                .desc           = "qos_on",
                .type           = EV_KEY,
                .code           = BTN_3,
-               .threshold      = 3,
+               .debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WZRHPG300NH_GPIO_BTN_QOS_ON,
                .active_low     = 0,
        }, {
                .desc           = "qos_off",
                .type           = EV_KEY,
                .code           = BTN_4,
-               .threshold      = 3,
+               .debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WZRHPG300NH_GPIO_BTN_QOS_OFF,
                .active_low     = 0,
        }, {
                .desc           = "router_on",
                .type           = EV_KEY,
                .code           = BTN_5,
-               .threshold      = 3,
+               .debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WZRHPG300NH_GPIO_BTN_ROUTER_ON,
                .active_low     = 0,
        }, {
                .desc           = "router_auto",
                .type           = EV_KEY,
                .code           = BTN_6,
-               .threshold      = 3,
+               .debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WZRHPG300NH_GPIO_BTN_ROUTER_AUTO,
                .active_low     = 0,
        }
@@ -213,7 +213,7 @@ static struct platform_device wzrhpg300nh_74hc153_device = {
        }
 };
 
-static struct rtl8366s_platform_data wzrhpg300nh_rtl8366s_data = {
+static struct rtl8366_platform_data wzrhpg300nh_rtl8366_data = {
        .gpio_sda       = WZRHPG300NH_GPIO_RTL8366_SDA,
        .gpio_sck       = WZRHPG300NH_GPIO_RTL8366_SCK,
 };
@@ -222,36 +222,35 @@ static struct platform_device wzrhpg300nh_rtl8366s_device = {
        .name           = RTL8366S_DRIVER_NAME,
        .id             = -1,
        .dev = {
-               .platform_data  = &wzrhpg300nh_rtl8366s_data,
+               .platform_data  = &wzrhpg300nh_rtl8366_data,
        }
 };
 
-static struct rtl8366rb_platform_data wzrhpg301nh_rtl8366rb_data = {
-       .gpio_sda       = WZRHPG300NH_GPIO_RTL8366_SDA,
-       .gpio_sck       = WZRHPG300NH_GPIO_RTL8366_SCK,
-};
-
-static struct platform_device wzrhpg301nh_rtl8366rb_device = {
+static struct platform_device wzrhpg300nh_rtl8366rb_device = {
        .name           = RTL8366RB_DRIVER_NAME,
        .id             = -1,
        .dev = {
-               .platform_data  = &wzrhpg301nh_rtl8366rb_data,
+               .platform_data  = &wzrhpg300nh_rtl8366_data,
        }
 };
 
-static void __init wzrhpg30xnh_setup(bool hasrtl8366rb)
+static void __init wzrhpg300nh_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
        u8 *mac = eeprom + WZRHPG300NH_MAC_OFFSET;
+       bool hasrtl8366rb = false;
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
        ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
 
+       if (rtl8366_smi_detect(&wzrhpg300nh_rtl8366_data) == RTL8366_TYPE_RB)
+               hasrtl8366rb = true;
+
        if (hasrtl8366rb) {
                ar71xx_eth0_pll_data.pll_1000 = 0x1f000000;
-               ar71xx_eth0_data.mii_bus_dev = &wzrhpg301nh_rtl8366rb_device.dev;
+               ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev;
                ar71xx_eth1_pll_data.pll_1000 = 0x100;
-               ar71xx_eth1_data.mii_bus_dev = &wzrhpg301nh_rtl8366rb_device.dev;
+               ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev;
        } else {
                ar71xx_eth0_pll_data.pll_1000 = 0x1e000100;
                ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
@@ -276,31 +275,18 @@ static void __init wzrhpg30xnh_setup(bool hasrtl8366rb)
        platform_device_register(&wzrhpg300nh_flash_device);
 
        if (hasrtl8366rb)
-               platform_device_register(&wzrhpg301nh_rtl8366rb_device);
+               platform_device_register(&wzrhpg300nh_rtl8366rb_device);
        else
                platform_device_register(&wzrhpg300nh_rtl8366s_device);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh_leds_gpio),
                                        wzrhpg300nh_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, WZRHPG300NH_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(wzrhpg300nh_gpio_buttons),
-                                       wzrhpg300nh_gpio_buttons);
-
-}
-
-static void __init wzrhpg300nh_setup(void)
-{
-       wzrhpg30xnh_setup(false);
-}
+       ar71xx_register_gpio_keys_polled(-1, WZRHPG300NH_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(wzrhpg300nh_gpio_keys),
+                                        wzrhpg300nh_gpio_keys);
 
-static void __init wzrhpg301nh_setup(void)
-{
-       wzrhpg30xnh_setup(true);
 }
 
 MIPS_MACHINE(AR71XX_MACH_WZR_HP_G300NH, "WZR-HP-G300NH",
             "Buffalo WZR-HP-G300NH", wzrhpg300nh_setup);
-
-MIPS_MACHINE(AR71XX_MACH_WZR_HP_G301NH, "WZR-HP-G301NH",
-            "Buffalo WZR-HP-G301NH", wzrhpg301nh_setup);