ramips: rt305x: remove CONFIG_MTD_PARTITION ifdefery from machine files

[openwrt/staging/chunkeey.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-hw550-3g.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
index ffb209456a2435221b8266e70ae2b67ab4cd7a56..21587812c46efa82becc432985794d27f37b5a9c 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
@@ -23,17 +23,16 @@
 #include "devices.h"
 
 #define HW550_3G_GPIO_LED_USB          8
-#define HW550_3G_GPIO_LED_3G_STAT      11
-#define HW550_3G_GPIO_LED_3G_TOGGLE    12
+#define HW550_3G_GPIO_LED_3G           11
+#define HW550_3G_GPIO_LED_STATUS       12
 #define HW550_3G_GPIO_LED_WPS          14
 
 #define HW550_3G_GPIO_BUTTON_RESET     10
-#define HW550_3G_GPIO_BUTTON_3G                7
+#define HW550_3G_GPIO_BUTTON_CONNECT   7
 #define HW550_3G_GPIO_BUTTON_WPS       0
 
 #define HW550_3G_BUTTONS_POLL_INTERVAL 20
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition hw550_3g_partitions[] = {
        {
                .name   = "u-boot",
@@ -53,28 +52,21 @@ static struct mtd_partition hw550_3g_partitions[] = {
        }, {
                .name   = "kernel",
                .offset = 0x050000,
-               .size   = 0x180000,
+               .size   = 0x0d0000,
        }, {
                .name   = "rootfs",
-               .offset = 0x1d0000,
-               .size   = 0x580000,
-       }, {
-               .name   = "user",
-               .offset = 0x750000,
-               .size   = 0x0b0000,
+               .offset = 0x120000,
+               .size   = 0x6e0000,
        }, {
                .name   = "firmware",
                .offset = 0x050000,
-               .size   = 0x700000,
+               .size   = 0x7b0000,
        }
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static struct physmap_flash_data hw550_3g_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
        .nr_parts       = ARRAY_SIZE(hw550_3g_partitions),
        .parts          = hw550_3g_partitions,
-#endif
 };
 
 static struct gpio_led hw550_3g_leds_gpio[] __initdata = {
@@ -83,12 +75,12 @@ static struct gpio_led hw550_3g_leds_gpio[] __initdata = {
                .gpio           = HW550_3G_GPIO_LED_USB,
                .active_low     = 1,
        }, {
-               .name           = "hw550-3g:green:3g-stat",
-               .gpio           = HW550_3G_GPIO_LED_3G_STAT,
+               .name           = "hw550-3g:green:3g",
+               .gpio           = HW550_3G_GPIO_LED_3G,
                .active_low     = 1,
        }, {
-               .name           = "hw550-3g:green:3g-toggle",
-               .gpio           = HW550_3G_GPIO_LED_3G_TOGGLE,
+               .name           = "hw550-3g:green:status",
+               .gpio           = HW550_3G_GPIO_LED_STATUS,
                .active_low     = 1,
        }, {
                .name           = "hw550-3g:green:wps",
@@ -106,11 +98,11 @@ static struct gpio_button hw550_3g_gpio_buttons[] __initdata = {
                .gpio           = HW550_3G_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
-               .desc           = "3g",
+               .desc           = "connect",
                .type           = EV_KEY,
-               .code           = BTN_1,
+               .code           = KEY_CONNECT,
                .threshold      = 3,
-               .gpio           = HW550_3G_GPIO_BUTTON_3G,
+               .gpio           = HW550_3G_GPIO_BUTTON_CONNECT,
                .active_low     = 1,
        }, {
                .desc           = "wps",
@@ -122,11 +114,16 @@ static struct gpio_button hw550_3g_gpio_buttons[] __initdata = {
        }
 };
 
+#define HW550_3G_GPIO_MODE \
+       ((RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT) | \
+        RT305X_GPIO_MODE_MDIO)
+
 static void __init hw550_3g_init(void)
 {
-       rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
+       rt305x_gpio_init(HW550_3G_GPIO_MODE);
 
        rt305x_register_flash(0, &hw550_3g_flash_data);
+       rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL;
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(hw550_3g_leds_gpio),
                                  hw550_3g_leds_gpio);
@@ -135,6 +132,7 @@ static void __init hw550_3g_init(void)
                                     hw550_3g_gpio_buttons);
        rt305x_register_wifi();
        rt305x_register_wdt();
+       rt305x_register_usb();
 }
 
 MIPS_MACHINE(RAMIPS_MACH_HW550_3G, "HW550-3G", "Aztech HW550-3G",