ar71xx: image: pass mtdlayout variables by value

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-nw718.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
index 9d2f47f..ff367f9 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nw718.c
@@ -9,11 +9,7 @@
  */
 
 #include <linux/init.h>
  */
 
 #include <linux/init.h>

-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>

 #include <linux/spi/spi.h>
 #include <linux/spi/spi.h>

-#include <linux/spi/flash.h>

 
 #include <asm/mach-ralink/machine.h>
 #include <asm/mach-ralink/dev-gpio-buttons.h>
 
 #include <asm/mach-ralink/machine.h>
 #include <asm/mach-ralink/dev-gpio-buttons.h>


@@ -32,49 +28,8 @@
 
 #define NW718_GPIO_SPI_CS0             3
 
 
 #define NW718_GPIO_SPI_CS0             3
 

-#define NW718_BUTTONS_POLL_INTERVAL    20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition nw718_partitions[] = {
-       {
-               .name   = "u-boot",
-               .offset = 0,
-               .size   = 0x030000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "config",
-               .offset = 0x030000,
-               .size   = 0x020000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "factory",
-               .offset = 0x050000,
-               .size   = 0x010000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "kernel",
-               .offset = 0x060000,
-               .size   = 0x090000,
-       }, {
-               .name   = "rootfs",
-               .offset = 0x150000,
-               .size   = 0x2b0000,
-       }, {
-               .name   = "firmware",
-               .offset = 0x060000,
-               .size   = 0x3a0000,
-       }
-};
-#define nw718_nr_parts         ARRAY_SIZE(nw718_partitions)
-#else
-#define nw718_nr_parts         0
-#define nw718_partitions       NULL
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct flash_platform_data nw718_flash_data = {
-       .nr_parts       = nw718_nr_parts,
-       .parts          = nw718_partitions,
-};
+#define NW718_KEYS_POLL_INTERVAL       20
+#define NW718_KEYS_DEBOUNCE_INTERVAL   (3 * NW718_KEYS_POLL_INTERVAL)

 
 static struct gpio_led nw718_leds_gpio[] __initdata = {
        {
 
 static struct gpio_led nw718_leds_gpio[] __initdata = {
        {


@@ -92,19 +47,19 @@ static struct gpio_led nw718_leds_gpio[] __initdata = {
        }
 };
 
        }
 };
 

-static struct gpio_button nw718_gpio_buttons[] __initdata = {
+static struct gpio_keys_button nw718_gpio_buttons[] __initdata = {

        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,

-               .threshold      = 3,
+               .debounce_interval = NW718_KEYS_DEBOUNCE_INTERVAL,

                .gpio           = NW718_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
                .gpio           = NW718_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,

-               .threshold      = 3,
+               .debounce_interval = NW718_KEYS_DEBOUNCE_INTERVAL,

                .gpio           = NW718_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
                .gpio           = NW718_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }


@@ -116,7 +71,6 @@ static struct spi_board_info nw718_spi_info[] = {
                .chip_select    = 0,
                .max_speed_hz   = 25000000,
                .modalias       = "m25p80",
                .chip_select    = 0,
                .max_speed_hz   = 25000000,
                .modalias       = "m25p80",

-               .platform_data  = &nw718_flash_data,

                .controller_data = (void *) NW718_GPIO_SPI_CS0,
        }
 };
                .controller_data = (void *) NW718_GPIO_SPI_CS0,
        }
 };


@@ -130,7 +84,7 @@ static void __init nw718_init(void)
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(nw718_leds_gpio),
                                  nw718_leds_gpio);
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(nw718_leds_gpio),
                                  nw718_leds_gpio);

-       ramips_register_gpio_buttons(-1, NW718_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, NW718_KEYS_POLL_INTERVAL,

                                     ARRAY_SIZE(nw718_gpio_buttons),
                                     nw718_gpio_buttons);
        rt305x_register_wifi();
                                     ARRAY_SIZE(nw718_gpio_buttons),
                                     nw718_gpio_buttons);
        rt305x_register_wifi();