| Message ID | 1464014270-11995-2-git-send-email-rogerq@ti.com |
|---|---|
| State | Accepted |
| Commit | 383f4a0ec78ee92c89a7ce135acbde47c84c6201 |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, May 23, 2016 at 05:37:47PM +0300, Roger Quadros wrote: > CONFIG_USB_XHCI_OMAP is enabled for host mode independent of CONFIG_USB_DWC3 > which is meant for gadget mode only. We need enable/disbale_usb_clocks() for > host mode as well so provide for it. > > Fixes: 09cc14f4bcbf ("ARM: AM43xx: Add functions to enable and disable USB clocks" > Signed-off-by: Roger Quadros <rogerq@ti.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c index 5c2a2ab..73ea955 100644 --- a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c +++ b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c @@ -160,7 +160,7 @@ void disable_edma3_clocks(void) } #endif -#ifdef CONFIG_USB_DWC3 +#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) void enable_usb_clocks(int index) { u32 *usbclkctrl = 0; diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c index 88e8920..8734815 100644 --- a/arch/arm/cpu/armv7/omap5/hw_data.c +++ b/arch/arm/cpu/armv7/omap5/hw_data.c @@ -602,7 +602,7 @@ void disable_edma3_clocks(void) } #endif -#ifdef CONFIG_USB_DWC3 +#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) void enable_usb_clocks(int index) { u32 cm_l3init_usb_otg_ss_clkctrl = 0;
CONFIG_USB_XHCI_OMAP is enabled for host mode independent of CONFIG_USB_DWC3 which is meant for gadget mode only. We need enable/disbale_usb_clocks() for host mode as well so provide for it. Fixes: 09cc14f4bcbf ("ARM: AM43xx: Add functions to enable and disable USB clocks" Signed-off-by: Roger Quadros <rogerq@ti.com> --- arch/arm/cpu/armv7/am33xx/clock_am43xx.c | 2 +- arch/arm/cpu/armv7/omap5/hw_data.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)