ramips: merge 2.6.39 patches

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt288x / mach-rt-n15.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
index f2905eb..066667e 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
@@ -13,14 +13,15 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/leds.h>
 #include <linux/rtl8366s.h>
+#include <linux/ethtool.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/rt288x.h>
 #include <asm/mach-ralink/rt288x_regs.h>
+#include <asm/mach-ralink/ramips_eth_platform.h>
 
 #include "devices.h"
 
@@ -59,7 +60,7 @@ static struct mtd_partition rt_n15_partitions[] = {
                .offset = 0x100000,
                .size   = 0x300000,
        }, {
-               .name   = "openwrt",
+               .name   = "firmware",
                .offset = 0x050000,
                .size   = 0x3b0000,
        }
@@ -85,14 +86,14 @@ static struct gpio_button rt_n15_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
+               .code           = KEY_RESTART,
                .threshold      = 3,
                .gpio           = RT_N15_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
+               .code           = KEY_WPS_BUTTON,
                .threshold      = 3,
                .gpio           = RT_N15_GPIO_BUTTON_WPS,
                .active_low     = 1,
@@ -126,6 +127,15 @@ static void __init rt_n15_init(void)
                                     rt_n15_gpio_buttons);
 
        platform_device_register(&rt_n15_rtl8366s_device);
+
+       rt288x_register_wifi();
+
+       rt288x_eth_data.speed = SPEED_1000;
+       rt288x_eth_data.duplex = DUPLEX_FULL;
+       rt288x_eth_data.tx_fc = 1;
+       rt288x_eth_data.rx_fc = 1;
+       rt288x_register_ethernet();
+       rt288x_register_wdt();
 }
 
 MIPS_MACHINE(RAMIPS_MACH_RT_N15, "RT-N15", "Asus RT-N15", rt_n15_init);