ARM: sa11x0: badge4: move board specific ohci initialization to badge4.c

Move the handling of the 5v supply into badge4.c, removing this board
specific detail from the sa1111 ohci driver.

Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 0 insertions, 14 deletions

diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index f61f4f90529e..48300080433c 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -16,7 +16,6 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <mach/assabet.h>
-#include <mach/badge4.h>
 #include <asm/hardware/sa1111.h>
 
 #ifndef CONFIG_SA1111
@@ -35,12 +34,6 @@ static int sa1111_start_hc(struct sa1111_dev *dev)
         printk(KERN_DEBUG "%s: starting SA-1111 OHCI USB Controller\n",
                __FILE__);
 
-#ifdef CONFIG_SA1100_BADGE4
-        if (machine_is_badge4()) {
-                badge4_set_5V(BADGE4_5V_USB, 1);
-        }
-#endif
-
         if (machine_is_xp860() ||
             machine_has_neponset() ||
             machine_is_pfs168() ||
@@ -84,13 +77,6 @@ static void sa1111_stop_hc(struct sa1111_dev *dev)
          * Stop the USB clock.
          */
         sa1111_disable_device(dev);
-
-#ifdef CONFIG_SA1100_BADGE4
-        if (machine_is_badge4()) {
-                /* Disable power to the USB bus */
-                badge4_set_5V(BADGE4_5V_USB, 0);
-        }
-#endif
 }