4 files changed, 36 insertions, 1 deletions

diff --git a/arch/mips/bcm47xx/Makefile b/arch/mips/bcm47xx/Makefile
index 4688b6a6211b..d58c51b5e501 100644
--- a/arch/mips/bcm47xx/Makefile
+++ b/arch/mips/bcm47xx/Makefile
@@ -4,4 +4,4 @@
 #
 
 obj-y                           += irq.o nvram.o prom.o serial.o setup.o time.o sprom.o
-obj-y                           += board.o buttons.o leds.o
+obj-y                           += board.o buttons.o leds.o workarounds.o
diff --git a/arch/mips/bcm47xx/bcm47xx_private.h b/arch/mips/bcm47xx/bcm47xx_private.h
index 5c94acebf76a..0194c3b9a729 100644
--- a/arch/mips/bcm47xx/bcm47xx_private.h
+++ b/arch/mips/bcm47xx/bcm47xx_private.h
@@ -9,4 +9,7 @@ int __init bcm47xx_buttons_register(void);
 /* leds.c */
 void __init bcm47xx_leds_register(void);
 
+/* workarounds.c */
+void __init bcm47xx_workarounds(void);
+
 #endif
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index b847d0373443..63a4b0e915dc 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -282,6 +282,7 @@ static int __init bcm47xx_register_bus_complete(void)
         }
         bcm47xx_buttons_register();
         bcm47xx_leds_register();
+        bcm47xx_workarounds();
 
         fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);
         return 0;
diff --git a/arch/mips/bcm47xx/workarounds.c b/arch/mips/bcm47xx/workarounds.c
new file mode 100644
index 000000000000..e81ce4623070
--- /dev/null
+++ b/arch/mips/bcm47xx/workarounds.c
@@ -0,0 +1,31 @@
+#include "bcm47xx_private.h"
+
+#include <linux/gpio.h>
+#include <bcm47xx_board.h>
+#include <bcm47xx.h>
+
+static void __init bcm47xx_workarounds_netgear_wnr3500l(void)
+{
+        const int usb_power = 12;
+        int err;
+
+        err = gpio_request_one(usb_power, GPIOF_OUT_INIT_HIGH, "usb_power");
+        if (err)
+                pr_err("Failed to request USB power gpio: %d\n", err);
+        else
+                gpio_free(usb_power);
+}
+
+void __init bcm47xx_workarounds(void)
+{
+        enum bcm47xx_board board = bcm47xx_board_get();
+
+        switch (board) {
+        case BCM47XX_BOARD_NETGEAR_WNR3500L:
+                bcm47xx_workarounds_netgear_wnr3500l();
+                break;
+        default:
+                /* No workaround(s) needed */
+                break;
+        }
+}