ramips: rename dev_gpio_leds.h to dev-gpio-leds.h

[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 11867632790a12cc84d777f86802d539fb5e0f89..655eab602c790eac1b9b514bb9680513198781f1 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
@@ -15,12 +15,15 @@
 #include <linux/mtd/physmap.h>
 #include <linux/leds.h>
 
-#include <asm/mips_machine.h>
 #include <asm/mach-ralink/machine.h>
-#include <asm/mach-ralink/dev_gpio_leds.h>
+#include <asm/mach-ralink/dev-gpio-leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
 
 #include "devices.h"
 
+#define V22RW_2X2_GPIO_BUTTON_WPS      0
+#define V22RW_2X2_GPIO_BUTTON_SWRST    10
 #define V22RW_2X2_GPIO_LED_SECURITY    13
 #define V22RW_2X2_GPIO_LED_WPS         14
 
@@ -78,11 +81,13 @@ static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
 
 static void __init v22rw_2x2_init(void)
 {
-       rt305x_register_flash(0, &v22rw_2x2_flash_data);
+       rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
+       rt305x_register_flash(0, &v22rw_2x2_flash_data);
+       rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(v22rw_2x2_leds_gpio),
                                  v22rw_2x2_leds_gpio);
 }
 
-MIPS_MACHINE(RAMIPS_MACH_V22RW_2X2, "Ralink AP-RT3052-V22RW-2X2",
+MIPS_MACHINE(RAMIPS_MACH_V22RW_2X2, "V22RW-2X2", "Ralink AP-RT3052-V22RW-2X2",
             v22rw_2x2_init);