ar71xx: image: pass mtdlayout variables by value

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.c
index 2358a5c..dec1a7b 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wcr150gn.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>


@@ -22,47 +19,61 @@
 
 #include "devices.h"
 
 
 #include "devices.h"
 

-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition wcr150gn_partitions[] = {
+#define WCR150GN_GPIO_LED_USER                 12
+#define WCR150GN_GPIO_LED_POWER                        8
+#define WCR150GN_GPIO_BUTTON_WPS               10
+#define WCR150GN_GPIO_BUTTON_RESET             0
+#define WCR150GN_KEYS_POLL_INTERVAL    20
+#define WCR150GN_KEYS_DEBOUNCE_INTERVAL        (3 * WCR150GN_KEYS_POLL_INTERVAL)
+
+static struct gpio_led wcr150gn_leds_gpio[] __initdata = {
+       {
+               .name       = "wcr150gn:amber:user",
+               .gpio       = WCR150GN_GPIO_LED_USER,
+               .active_low = 1,
+       },

        {
        {

-               .name   = "Bootloader",
-               .offset = 0,
-               .size   = 0x030000,
-               .mask_flags = MTD_WRITEABLE,
-       }, {
-               .name   = "Config",
-               .offset = 0x030000,
-               .size   = 0x040000,
-       }, {
-               .name   = "Factory",
-               .offset = 0x040000,
-               .size   = 0x050000,
-       }, {
-               .name   = "Kernel",
-               .offset = 0x050000,
-               .size   = 0x120000,
-       }, {
-               .name   = "rootfs",
-               .offset = 0x120000,
-               .size   = 0x400000,
+               .name       = "wcr150gn:amber:power",
+               .gpio       = WCR150GN_GPIO_LED_POWER,
+               .active_low = 1,

        }
 };
        }
 };

-#endif /* CONFIG_MTD_PARTITIONS */

 
 

-static struct physmap_flash_data wcr150gn_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-       .nr_parts       = ARRAY_SIZE(wcr150gn_partitions),
-       .parts          = wcr150gn_partitions,
-#endif
+static struct gpio_keys_button wcr150gn_gpio_buttons[] __initdata = {
+       {
+               .desc       = "wps",
+               .type       = EV_KEY,
+               .code       = KEY_WPS_BUTTON,
+               .debounce_interval = WCR150GN_KEYS_DEBOUNCE_INTERVAL,
+               .gpio       = WCR150GN_GPIO_BUTTON_WPS,
+               .active_low = 1,
+       },
+       {
+               .desc       = "reset",
+               .type       = EV_KEY,
+               .code       = KEY_RESTART,
+               .debounce_interval = WCR150GN_KEYS_DEBOUNCE_INTERVAL,
+               .gpio       = WCR150GN_GPIO_BUTTON_RESET,
+               .active_low = 1,
+       }

 };
 
 static void __init wcr150gn_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 };
 
 static void __init wcr150gn_init(void)
 {
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);

-       rt305x_register_flash(0, &wcr150gn_flash_data);
+
+       rt305x_register_flash(0);
+
+       ramips_register_gpio_leds(-1, ARRAY_SIZE(wcr150gn_leds_gpio),
+                                 wcr150gn_leds_gpio);
+       ramips_register_gpio_buttons(-1, WCR150GN_KEYS_POLL_INTERVAL,
+                                    ARRAY_SIZE(wcr150gn_gpio_buttons),
+                                    wcr150gn_gpio_buttons);
+       rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;

        rt305x_register_ethernet();
        rt305x_register_wifi();
        rt305x_register_wdt();
        rt305x_register_ethernet();
        rt305x_register_wifi();
        rt305x_register_wdt();

+       rt305x_register_usb();

 }
 
 MIPS_MACHINE(RAMIPS_MACH_WCR150GN, "WCR150GN", "Sparklan WCR-150GN",
 }
 
 MIPS_MACHINE(RAMIPS_MACH_WCR150GN, "WCR150GN", "Sparklan WCR-150GN",