commit 658be1c97f5c70795c430f30571d36886cf34a2f
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 27 10:57:12 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 27 10:57:12 2013 -0700
tree 5c1b72cd283b12a0fb43ed7375dcc5cf0c9772f9
parent c835e3412aa624b26b486307653f833bbcb7a68c
parent 2a94f0008039b2f8e49b49b3584c337240a15454

Merge "msm8974: Removing use of usb boot clock control"

platform/msm8974/acpuclock.c

diff --git a/platform/msm8974/acpuclock.c b/platform/msm8974/acpuclock.c
index 9f4b6e4..c4a86af 100644
--- a/platform/msm8974/acpuclock.c
+++ b/platform/msm8974/acpuclock.c
@@ -61,9 +61,6 @@
 	iclk = clk_get("usb_iface_clk");
 	cclk = clk_get("usb_core_clk");
 
-	/* Disable USB all clock init */
-	writel(0, USB_BOOT_CLOCK_CTL);
-
 	clk_disable(iclk);
 	clk_disable(cclk);
 

platform/msm8974/include/platform/iomap.h

diff --git a/platform/msm8974/include/platform/iomap.h b/platform/msm8974/include/platform/iomap.h
index 55b3291..02dc0a9 100644
--- a/platform/msm8974/include/platform/iomap.h
+++ b/platform/msm8974/include/platform/iomap.h
@@ -84,7 +84,6 @@
 #define GCC_WDOG_DEBUG              (CLK_CTL_BASE +  0x00001780)
 
 #define USB_HS_BCR                  (CLK_CTL_BASE + 0x480)
-#define USB_BOOT_CLOCK_CTL          (CLK_CTL_BASE + 0x1A00)
 
 #define SPMI_BASE                   0xFC4C0000
 #define SPMI_GENI_BASE              (SPMI_BASE + 0xA000)