[toolchain]: nuke support for older gcc versions, except for 4.4.6 (needed for avr32...

[openwrt.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 ffb2094..37fc6fd 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,12 +23,12 @@
 #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
@@ -83,12 +83,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 +106,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,9 +122,13 @@ 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_register_ethernet();