ar71xx: image: pass mtdlayout variables by value

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
index 655eab6..7f43dab 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
@@ -1,7 +1,7 @@
 /*
  *  Ralink AP-RT3052-V22RW-2X2 board support
  *
 /*
  *  Ralink AP-RT3052-V22RW-2X2 board support
  *

- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>

  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published


@@ -10,12 +10,9 @@
 
 #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 <linux/leds.h>

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

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

 #include <asm/mach-ralink/dev-gpio-leds.h>
 #include <asm/mach-ralink/rt305x.h>
 #include <asm/mach-ralink/rt305x_regs.h>
 #include <asm/mach-ralink/dev-gpio-leds.h>
 #include <asm/mach-ralink/rt305x.h>
 #include <asm/mach-ralink/rt305x_regs.h>


@@ -27,45 +24,8 @@
 #define V22RW_2X2_GPIO_LED_SECURITY    13
 #define V22RW_2X2_GPIO_LED_WPS         14
 
 #define V22RW_2X2_GPIO_LED_SECURITY    13
 #define V22RW_2X2_GPIO_LED_WPS         14
 

-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition v22rw_2x2_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   = 0x2b0000,
-       }, {
-               .name   = "openwrt",
-               .offset = 0x050000,
-               .size   = 0x3b0000,
-       }
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct physmap_flash_data v22rw_2x2_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-       .nr_parts       = ARRAY_SIZE(v22rw_2x2_partitions),
-       .parts          = v22rw_2x2_partitions,
-#endif
-};
+#define V22RW_2X2_KEYS_POLL_INTERVAL   20
+#define V22RW_2X2_KEYS_DEBOUNCE_INTERVAL (3 * V22RW_2X2_KEYS_POLL_INTERVAL)

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


@@ -79,14 +39,40 @@ static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
        }
 };
 
        }
 };
 

+static struct gpio_keys_button v22rw_2x2_gpio_buttons[] __initdata = {
+       {
+               .desc           = "reset",
+               .type           = EV_KEY,
+               .code           = KEY_RESTART,
+               .debounce_interval = V22RW_2X2_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = V22RW_2X2_GPIO_BUTTON_SWRST,
+               .active_low     = 1,
+       }, {
+               .desc           = "wps",
+               .type           = EV_KEY,
+               .code           = KEY_WPS_BUTTON,
+               .debounce_interval = V22RW_2X2_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = V22RW_2X2_GPIO_BUTTON_WPS,
+               .active_low     = 1,
+       }
+};
+

 static void __init v22rw_2x2_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
 static void __init v22rw_2x2_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 

-       rt305x_register_flash(0, &v22rw_2x2_flash_data);
+       rt305x_register_flash(0);
+
+       rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;

        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(v22rw_2x2_leds_gpio),
                                  v22rw_2x2_leds_gpio);
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(v22rw_2x2_leds_gpio),
                                  v22rw_2x2_leds_gpio);

+       ramips_register_gpio_buttons(-1, V22RW_2X2_KEYS_POLL_INTERVAL,
+                                    ARRAY_SIZE(v22rw_2x2_gpio_buttons),
+                                    v22rw_2x2_gpio_buttons);
+       rt305x_register_wifi();
+       rt305x_register_wdt();
+       rt305x_register_usb();

 }
 
 MIPS_MACHINE(RAMIPS_MACH_V22RW_2X2, "V22RW-2X2", "Ralink AP-RT3052-V22RW-2X2",
 }
 
 MIPS_MACHINE(RAMIPS_MACH_V22RW_2X2, "V22RW-2X2", "Ralink AP-RT3052-V22RW-2X2",