ar71xx: image: pass mtdlayout variables by value

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
index 21755cb..7a21488 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
@@ -10,9 +10,6 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
 #include <linux/init.h>
 #include <linux/platform_device.h>

-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.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>


@@ -25,47 +22,8 @@
 #define BC2_GPIO_BUTTON_RESET          17
 #define BC2_GPIO_LED_USB               20
 
 #define BC2_GPIO_BUTTON_RESET          17
 #define BC2_GPIO_LED_USB               20
 

-#define BC2_BUTTONS_POLL_INTERVAL      20
-
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition bc2_partitions[] = {
-       {
-               .name   = "u-boot",
-               .offset = 0,
-               .size   = 0x030000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "u-boot-env",
-               .offset = 0x030000,
-               .size   = 0x010000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "factory",
-               .offset = 0x040000,
-               .size   = 0x010000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "kernel",
-               .offset = 0x050000,
-               .size   = 0x0a0000,
-       }, {
-               .name   = "rootfs",
-               .offset = 0x150000,
-               .size   = 0x6b0000,
-       }, {
-               .name   = "firmware",
-               .offset = 0x050000,
-               .size   = 0x7b0000,
-       }
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data bc2_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-       .nr_parts       = ARRAY_SIZE(bc2_partitions),
-       .parts          = bc2_partitions,
-#endif
-};
+#define BC2_KEYS_POLL_INTERVAL         20
+#define BC2_KEYS_DEBOUNCE_INTERVAL     (3 * BC2_KEYS_POLL_INTERVAL)

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


@@ -75,12 +33,12 @@ static struct gpio_led bc2_leds_gpio[] __initdata = {
        }
 };
 
        }
 };
 

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

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

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

                .gpio           = BC2_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }
                .gpio           = BC2_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }


@@ -92,12 +50,12 @@ static void __init bc2_init(void)
                          RT305X_GPIO_MODE_UART0_SHIFT) |
                          RT305X_GPIO_MODE_JTAG);
 
                          RT305X_GPIO_MODE_UART0_SHIFT) |
                          RT305X_GPIO_MODE_JTAG);
 

-       rt305x_register_flash(0, &bc2_flash_data);
+       rt305x_register_flash(0);

 
        ramips_register_gpio_leds(-1, ARRAY_SIZE(bc2_leds_gpio),
                                  bc2_leds_gpio);
 
 
        ramips_register_gpio_leds(-1, ARRAY_SIZE(bc2_leds_gpio),
                                  bc2_leds_gpio);
 

-       ramips_register_gpio_buttons(-1, BC2_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, BC2_KEYS_POLL_INTERVAL,

                                     ARRAY_SIZE(bc2_gpio_buttons),
                                     bc2_gpio_buttons);
 
                                     ARRAY_SIZE(bc2_gpio_buttons),
                                     bc2_gpio_buttons);