ramips: use gpio-keys-polled instead of gpio-buttons

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / arch / mips / ralink / rt288x / mach-rt-n15.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
index 877bff3aee051fbda4a20ded061f03b36929a842..dcffec0006cf3cf9d613cc60eea58ab06ded8bc9 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
@@ -13,13 +13,15 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/leds.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
+#include <linux/ethtool.h>
 
 #include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/dev_gpio_leds.h>
+#include <asm/mach-ralink/dev-gpio-buttons.h>
+#include <asm/mach-ralink/dev-gpio-leds.h>
 #include <asm/mach-ralink/rt288x.h>
 #include <asm/mach-ralink/rt288x_regs.h>
+#include <asm/mach-ralink/ramips_eth_platform.h>
 
 #include "devices.h"
 
@@ -30,7 +32,9 @@
 #define RT_N15_GPIO_RTL8366_SCK                2
 #define RT_N15_GPIO_RTL8366_SDA                1
 
-#ifdef CONFIG_MTD_PARTITIONS
+#define RT_N15_KEYS_POLL_INTERVAL      20
+#define RT_N15_KEYS_DEBOUNCE_INTERVAL  (3 * RT_N15_KEYS_POLL_INTERVAL)
+
 static struct mtd_partition rt_n15_partitions[] = {
        {
                .name   = "u-boot",
@@ -50,24 +54,21 @@ static struct mtd_partition rt_n15_partitions[] = {
        }, {
                .name   = "kernel",
                .offset = 0x050000,
-               .size   = 0x0b0000,
+               .size   = 0x0d0000,
        }, {
                .name   = "rootfs",
-               .offset = 0x100000,
-               .size   = 0x300000,
+               .offset = 0x120000,
+               .size   = 0x2e0000,
        }, {
-               .name   = "openwrt",
+               .name   = "firmware",
                .offset = 0x050000,
                .size   = 0x3b0000,
        }
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data rt_n15_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
        .nr_parts       = ARRAY_SIZE(rt_n15_partitions),
        .parts          = rt_n15_partitions,
-#endif
 };
 
 static struct gpio_led rt_n15_leds_gpio[] __initdata = {
@@ -78,7 +79,25 @@ static struct gpio_led rt_n15_leds_gpio[] __initdata = {
        }
 };
 
-static struct rtl8366s_platform_data rt_n15_rtl8366s_data = {
+static struct gpio_keys_button rt_n15_gpio_buttons[] __initdata = {
+       {
+               .desc           = "reset",
+               .type           = EV_KEY,
+               .code           = KEY_RESTART,
+               .debounce_interval = RT_N15_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = RT_N15_GPIO_BUTTON_RESET,
+               .active_low     = 1,
+       }, {
+               .desc           = "wps",
+               .type           = EV_KEY,
+               .code           = KEY_WPS_BUTTON,
+               .debounce_interval = RT_N15_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = RT_N15_GPIO_BUTTON_WPS,
+               .active_low     = 1,
+       }
+};
+
+static struct rtl8366_platform_data rt_n15_rtl8366s_data = {
        .gpio_sda        = RT_N15_GPIO_RTL8366_SDA,
        .gpio_sck        = RT_N15_GPIO_RTL8366_SCK,
 };
@@ -100,7 +119,20 @@ static void __init rt_n15_init(void)
        ramips_register_gpio_leds(-1, ARRAY_SIZE(rt_n15_leds_gpio),
                                  rt_n15_leds_gpio);
 
+       ramips_register_gpio_buttons(-1, RT_N15_KEYS_POLL_INTERVAL,
+                                    ARRAY_SIZE(rt_n15_gpio_buttons),
+                                    rt_n15_gpio_buttons);
+
        platform_device_register(&rt_n15_rtl8366s_device);
+
+       rt288x_register_wifi();
+
+       rt288x_eth_data.speed = SPEED_1000;
+       rt288x_eth_data.duplex = DUPLEX_FULL;
+       rt288x_eth_data.tx_fc = 1;
+       rt288x_eth_data.rx_fc = 1;
+       rt288x_register_ethernet();
+       rt288x_register_wdt();
 }
 
 MIPS_MACHINE(RAMIPS_MACH_RT_N15, "RT-N15", "Asus RT-N15", rt_n15_init);