aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuslan Bilovol <ruslan.bilovol@ti.com>2012-09-19 17:15:52 +0300
committerZiyann <jaraidaniel@gmail.com>2014-10-01 12:59:06 +0200
commitc809d9d563852ca2e971dda6a30685e39c39f3b9 (patch)
tree1f791c0feb0f6bea46fd45da4312b5f5891bf517
parentd139ac4a14131ddd3efa65a4cb25fb297ca88a3d (diff)
downloadkernel_samsung_tuna-c809d9d563852ca2e971dda6a30685e39c39f3b9.zip
kernel_samsung_tuna-c809d9d563852ca2e971dda6a30685e39c39f3b9.tar.gz
kernel_samsung_tuna-c809d9d563852ca2e971dda6a30685e39c39f3b9.tar.bz2
Revert "OMAP4: early mux initialization for EHCI"
This reverts commit 5a2e0ba0863d099bbb454a303e8927b54d4f22bf. Reverted commit does USB Host muxes initialization too early. In case of HSIC connection, this generates IDLE state on the line before USB Host initialization. But HSIC Device generates CONNECT on the bus as soon as detects IDLE. However, since USB Host is initialized later, it misses this event. Change-Id: I90219bce6d55bc828ea5b76f6cf9efa272f28e0b Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
-rw-r--r--arch/arm/mach-omap2/usb-host.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 4ab03c9..a4d4d54 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -959,11 +959,7 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
setup_ohci_io_mux(pdata->port_mode);
} else if (cpu_is_omap44xx()) {
oh[2]->mux = setup_4430ehci_io_mux(pdata->port_mode);
- if (oh[2]->mux)
- omap_hwmod_mux(oh[2]->mux, _HWMOD_STATE_ENABLED);
oh[1]->mux = setup_4430ohci_io_mux(pdata->port_mode);
- if (oh[1]->mux)
- omap_hwmod_mux(oh[1]->mux, _HWMOD_STATE_ENABLED);
}
od = omap_device_build_ss(OMAP_USBHS_DEVICE, bus_id, oh, 4,