commit 62cf63ea8ef44c3bb893045f1d8b440d298e2e35
author Matt Wagantall <mattw@codeaurora.org> Wed Aug 17 16:34:47 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:48 2011 -0700
tree 871f22b2b8798d277b893e2f836d8ae646952a31
parent 3405933cf3c41fa1f297f1c2c4318b4258b89b33

msm: clock: Rename unused GSBI clocks to match new naming convention

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

arch/arm/mach-msm/devices-8960.c

diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 0c18466..73953f9 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1449,18 +1449,18 @@
 	CLK_DUMMY("core_clk",	GSBI10_UART_CLK,	NULL, OFF),
 	CLK_DUMMY("core_clk",	GSBI11_UART_CLK,	NULL, OFF),
 	CLK_DUMMY("core_clk",	GSBI12_UART_CLK,	NULL, OFF),
-	CLK_DUMMY("core_clk",	GSBI1_QUP_CLK,		 "spi_qsd.0", OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI2_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI3_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("core_clk",		GSBI4_QUP_CLK,	 "qup_i2c.4", OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI5_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI6_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI7_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI8_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI9_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI10_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI11_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI12_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI1_QUP_CLK,		"spi_qsd.0", OFF),
+	CLK_DUMMY("core_clk",	GSBI2_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI3_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI4_QUP_CLK,		"qup_i2c.4", OFF),
+	CLK_DUMMY("core_clk",	GSBI5_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI6_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI7_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI8_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI9_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI10_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI11_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",	GSBI12_QUP_CLK,		NULL, OFF),
 	CLK_DUMMY("pdm_clk",		PDM_CLK,		NULL, OFF),
 	CLK_DUMMY("pmem_clk",		PMEM_CLK,		NULL, OFF),
 	CLK_DUMMY("prng_clk",		PRNG_CLK,		NULL, OFF),
@@ -1481,20 +1481,20 @@
 	CLK_DUMMY("usb_fs_sys_clk",	USB_FS2_SYS_CLK,	NULL, OFF),
 	CLK_DUMMY("ce_pclk",		CE2_CLK,		NULL, OFF),
 	CLK_DUMMY("ce_clk",		CE1_CORE_CLK,		NULL, OFF),
-	CLK_DUMMY("iface_clk",		GSBI1_P_CLK,     "spi_qsd.0", OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI2_P_CLK,
+	CLK_DUMMY("iface_clk",		GSBI1_P_CLK, "spi_qsd.0", OFF),
+	CLK_DUMMY("iface_clk",		GSBI2_P_CLK,
 						  "msm_serial_hsl.0", OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI3_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI3_P_CLK,		NULL, OFF),
 	CLK_DUMMY("iface_clk",		GSBI4_P_CLK,	 "qup_i2c.4", OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI5_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI5_P_CLK,		NULL, OFF),
 	CLK_DUMMY("iface_clk",		GSBI6_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI7_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI8_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI9_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI10_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI11_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI12_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI12_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI7_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI8_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI9_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI10_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI11_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI12_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI12_P_CLK,		NULL, OFF),
 	CLK_DUMMY("tsif_pclk",		TSIF_P_CLK,		NULL, OFF),
 	CLK_DUMMY("usb_fs_pclk",	USB_FS1_P_CLK,		NULL, OFF),
 	CLK_DUMMY("usb_fs_pclk",	USB_FS2_P_CLK,		NULL, OFF),