diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ohci-omap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 4531d03503c3..439e6e4f2d6b 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
26 | 26 | ||
27 | #include <mach/mux.h> | 27 | #include <mach/mux.h> |
28 | #include <plat/fpga.h> | ||
29 | 28 | ||
30 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
31 | #include <mach/irqs.h> | 30 | #include <mach/irqs.h> |
@@ -93,14 +92,14 @@ static int omap_ohci_transceiver_power(int on) | |||
93 | { | 92 | { |
94 | if (on) { | 93 | if (on) { |
95 | if (machine_is_omap_innovator() && cpu_is_omap1510()) | 94 | if (machine_is_omap_innovator() && cpu_is_omap1510()) |
96 | fpga_write(fpga_read(INNOVATOR_FPGA_CAM_USB_CONTROL) | 95 | __raw_writeb(__raw_readb(INNOVATOR_FPGA_CAM_USB_CONTROL) |
97 | | ((1 << 5/*usb1*/) | (1 << 3/*usb2*/)), | 96 | | ((1 << 5/*usb1*/) | (1 << 3/*usb2*/)), |
98 | INNOVATOR_FPGA_CAM_USB_CONTROL); | 97 | INNOVATOR_FPGA_CAM_USB_CONTROL); |
99 | else if (machine_is_omap_osk()) | 98 | else if (machine_is_omap_osk()) |
100 | tps65010_set_gpio_out_value(GPIO1, LOW); | 99 | tps65010_set_gpio_out_value(GPIO1, LOW); |
101 | } else { | 100 | } else { |
102 | if (machine_is_omap_innovator() && cpu_is_omap1510()) | 101 | if (machine_is_omap_innovator() && cpu_is_omap1510()) |
103 | fpga_write(fpga_read(INNOVATOR_FPGA_CAM_USB_CONTROL) | 102 | __raw_writeb(__raw_readb(INNOVATOR_FPGA_CAM_USB_CONTROL) |
104 | & ~((1 << 5/*usb1*/) | (1 << 3/*usb2*/)), | 103 | & ~((1 << 5/*usb1*/) | (1 << 3/*usb2*/)), |
105 | INNOVATOR_FPGA_CAM_USB_CONTROL); | 104 | INNOVATOR_FPGA_CAM_USB_CONTROL); |
106 | else if (machine_is_omap_osk()) | 105 | else if (machine_is_omap_osk()) |