ar71xx: rb2011: use board name from the hardware config

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-tl-wdr4300.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
index 483aa6e935f533ec732897e39f1c7af437bdd20c..bf4cf4629efd1413355f634300a68c89bc5de4ab 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
@@ -121,7 +121,7 @@ static struct ar8327_led_cfg wdr4300_ar8327_led_cfg = {
 
 static struct ar8327_platform_data wdr4300_ar8327_data = {
        .pad0_cfg = &wdr4300_ar8327_pad0_cfg,
-       .cpuport_cfg = {
+       .port0_cfg = {
                .force_link = 1,
                .speed = AR8327_PORT_SPEED_1000,
                .duplex = 1,
@@ -175,10 +175,12 @@ static void __init wdr4300_setup(void)
        ath79_eth0_pll_data.pll_1000 = 0x06000000;
        ath79_register_eth(0);
 
-       ath79_set_usb_power_gpio(WDR4300_GPIO_USB1_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB1 power");
-       ath79_set_usb_power_gpio(WDR4300_GPIO_USB2_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB2 power");
+       gpio_request_one(WDR4300_GPIO_USB1_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB1 power");
+       gpio_request_one(WDR4300_GPIO_USB2_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB2 power");
        ath79_register_usb();
 }