ar71xx: Arduino Yun board 'WLAN RST' button support

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

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
index 6ccafcb..733d996 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
@@ -44,22 +44,14 @@ static struct mtd_partition wzrhpg300nh2_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,
        }
 };
 
@@ -156,10 +148,11 @@ static void __init wzrhpg300nh2_setup(void)
        ath79_eth0_data.phy_mask = BIT(0);
 
        ath79_register_eth(0);
-       ath79_register_usb();
+
        /* gpio13 is usb power.  Turn it on. */
-       gpio_request(13, "usb");
-       gpio_direction_output(13, 1);
+       gpio_request_one(13, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
+       ath79_register_usb();
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh2_leds_gpio),
                                 wzrhpg300nh2_leds_gpio);