ramips: rt305x: nuke built-in MTD partition maps

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-rt-g32-revb.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c
index 6963c1744e18a1e3b776dfade7f36a0830dd497d..2f0f710874b0986b68cdad935586dc838a6c0f80 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-g32-revb.c
@@ -12,8 +12,6 @@
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
 
 #include <asm/mach-ralink/machine.h>
 #include <asm/mach-ralink/dev-gpio-buttons.h>
@@ -25,43 +23,11 @@
 #define RT_G32B_GPIO_BUTTON_WPS                0       /* active low */
 #define RT_G32B_GPIO_BUTTON_RESET      10      /* active low */
 
-#define RT_G32B_BUTTONS_POLL_INTERVAL  20
-
-static struct mtd_partition rt_g32b_partitions[] = {
-       {
-               .name   = "u-boot",
-               .offset = 0,
-               .size   = 0x030000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "devdata",
-               .offset = 0x030000,
-               .size   = 0x010000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "devconf",
-               .offset = 0x040000,
-               .size   = 0x010000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "kernel",
-               .offset = 0x050000,
-               .size   = 0x0d0000,
-       }, {
-               .name   = "rootfs",
-               .offset = 0x120000,
-               .size   = 0x2e0000,
-       }, {
-               .name   = "firmware",
-               .offset = 0x050000,
-               .size   = 0x3b0000,
-       }
-};
+#define RT_G32B_KEYS_POLL_INTERVAL     20
+#define RT_G32B_KEYS_DEBOUNCE_INTERVAL (3 * RT_G32B_KEYS_POLL_INTERVAL)
 
 const struct flash_platform_data rt_g32b_flash = {
        .type           = "mx25l3205d",
-       .parts          = rt_g32b_partitions,
-       .nr_parts       = ARRAY_SIZE(rt_g32b_partitions),
 };
 
 struct spi_board_info __initdata rt_g32b_spi_slave_info[] = {
@@ -75,19 +41,19 @@ struct spi_board_info __initdata rt_g32b_spi_slave_info[] = {
        },
 };
 
-static struct gpio_button rt_g32b_gpio_buttons[] __initdata = {
+static struct gpio_keys_button rt_g32b_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = RT_G32B_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = RT_G32B_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = RT_G32B_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = RT_G32B_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
@@ -101,7 +67,7 @@ static void __init rt_g32b_init(void)
 
        rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;
        rt305x_register_ethernet();
-       ramips_register_gpio_buttons(-1, RT_G32B_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, RT_G32B_KEYS_POLL_INTERVAL,
                                     ARRAY_SIZE(rt_g32b_gpio_buttons),
                                     rt_g32b_gpio_buttons);
        rt305x_register_wifi();