msm: clock-9615: Prevent USB-HS clocks from voting on CXO

Due to power requirements arising from the USB bus suspend
feature, it is required that some USB-HS clocks be left on
across XO shutdown. Prevent these clocks from voting for
CXO in the sleep set.

CRs-Fixed: 376857
Change-Id: I38704fccaba26857f79dc0fc73672a95a050609b
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-9615.c b/arch/arm/mach-msm/clock-9615.c
index cf53901..3c9bd36 100644
--- a/arch/arm/mach-msm/clock-9615.c
+++ b/arch/arm/mach-msm/clock-9615.c
@@ -657,11 +657,17 @@
 		.ns_val = NS(23, 16, n, m, 5, 4, 3, d, 2, 0, s##_to_bb_mux), \
 	}
 static struct clk_freq_tbl clk_tbl_usb[] = {
-	F_USB(       0, gnd,  1, 0,  0),
+	F_USB(       0,  gnd, 1, 0,  0),
 	F_USB(60000000, pll8, 1, 5, 32),
 	F_END
 };
 
+static struct clk_freq_tbl clk_tbl_usb_hs1_sys[] = {
+	F_USB(       0,		    gnd, 1, 0,  0),
+	F_USB(60000000, pll8_activeonly, 1, 5, 32),
+	F_END
+};
+
 static struct clk_freq_tbl clk_tbl_usb_hsic_sys[] = {
 	F_USB(       0,		    gnd, 1, 0, 0),
 	F_USB(64000000, pll8_activeonly, 1, 1, 6),
@@ -708,7 +714,7 @@
 	.ns_mask = (BM(23, 16) | BM(6, 0)),
 	.mnd_en_mask = BIT(8),
 	.set_rate = set_rate_mnd,
-	.freq_tbl = clk_tbl_usb,
+	.freq_tbl = clk_tbl_usb_hs1_sys,
 	.current_freq = &rcg_dummy_freq,
 	.c = {
 		.dbg_name = "usb_hs1_sys_clk",