Merge commit 'refs/changes/61/14061/6' of git://git-android.quicinc.com/kernel/lk into clean_tip
diff --git a/platform/msm_shared/hsusb.c b/platform/msm_shared/hsusb.c
index dc304b1..b0bf7a8 100644
--- a/platform/msm_shared/hsusb.c
+++ b/platform/msm_shared/hsusb.c
@@ -486,15 +486,20 @@
/* wait for completion */
while(readl(USB_ULPI_VIEWPORT) & ULPI_RUN) ;
}
-#ifdef PLATFORM_MSM7X30
-void usb_clock_init(void)
+
+
+void hsusb_clock_init(void)
{
+ // Enable usb clocks from apps processor for 7x30.
+ // USB clocks already initialized for other targets
+ // so skipping proc comm call to enable usb clocks.
+#ifdef PLATFORM_MSM7X30
writel(0x00000100, USBH_NS_REG);
writel(0x00000900, USBH_NS_REG);
writel(0x00000A00, USBH_NS_REG);
writel(0x00002A00, USBH_NS_REG);
-}
#endif
+}
void board_usb_init(void);
void board_ulpi_init(void);
@@ -510,9 +515,6 @@
//dprintf(INFO, "USB ID %08x\n", readl(USB_ID));
// board_usb_init();
-#ifdef PLATFORM_MSM7X30
- usb_clock_init();
-#endif
/* select ULPI phy */
writel(0x81000000, USB_PORTSC);
diff --git a/platform/msm_shared/proc_comm.c b/platform/msm_shared/proc_comm.c
index 3a09543..9f9bd63 100644
--- a/platform/msm_shared/proc_comm.c
+++ b/platform/msm_shared/proc_comm.c
@@ -220,12 +220,6 @@
clock_set_rate(UART3_CLK, 19200000 / 4);
}
-void hsusb_clock_init(void)
-{
- clock_enable(USB_HS_CLK);
- clock_enable(USB_HS_PCLK);
-}
-
void mddi_clock_init(unsigned num, unsigned rate)
{
unsigned clock_id;