ar71xx: add v3.18 support

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-wzr-hp-ag300h.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
index 868514c..edd48f2 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
@@ -43,22 +43,14 @@ static struct mtd_partition wzrhpag300h_flash_partitions[] = {
                .size           = 0x0010000,
                .mask_flags     = MTD_WRITEABLE,
        }, {
-               .name           = "kernel",
+               .name           = "firmware",
                .offset         = 0x0060000,
-               .size           = 0x0100000,
-       }, {
-               .name           = "rootfs",
-               .offset         = 0x0160000,
-               .size           = 0x1e90000,
+               .size           = 0x1f90000,
        }, {
                .name           = "user_property",
                .offset         = 0x1ff0000,
                .size           = 0x0010000,
                .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "firmware",
-               .offset         = 0x0060000,
-               .size           = 0x1f90000,
        }
 };
 
@@ -140,21 +132,21 @@ static struct gpio_keys_button wzrhpag300h_gpio_keys[] __initdata = {
                .active_low     = 1,
        }, {
                .desc           = "router_auto",
-               .type           = EV_KEY,
+               .type           = EV_SW,
                .code           = BTN_6,
                .debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = 6,
                .active_low     = 1,
        }, {
                .desc           = "router_off",
-               .type           = EV_KEY,
+               .type           = EV_SW,
                .code           = BTN_5,
                .debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = 7,
                .active_low     = 1,
        }, {
                .desc           = "movie_engine",
-               .type           = EV_KEY,
+               .type           = EV_SW,
                .code           = BTN_7,
                .debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = 8,
@@ -185,7 +177,8 @@ static void __init wzrhpag300h_setup(void)
        ath79_register_eth(0);
        ath79_register_eth(1);
 
-       ath79_set_usb_power_gpio(2, GPIOF_OUT_INIT_HIGH, "USB power");
+       gpio_request_one(2, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpag300h_leds_gpio),
@@ -209,5 +202,4 @@ static void __init wzrhpag300h_setup(void)
 }
 
 MIPS_MACHINE(ATH79_MACH_WZR_HP_AG300H, "WZR-HP-AG300H",
-            "Buffalo WZR-HP-AG300H", wzrhpag300h_setup);
-
+            "Buffalo WZR-HP-AG300H/WZR-600DHP", wzrhpag300h_setup);