diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 56aec1e..2acb533 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4205,16 +4205,16 @@
 	CLK_LOOKUP("core_clk",		gsbi11_uart_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi12_uart_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi1_qup_clk.c,	"spi_qsd.0"),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi2_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi2_qup_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi3_qup_clk.c,	"qup_i2c.3"),
 	CLK_LOOKUP("core_clk",		gsbi4_qup_clk.c,	"qup_i2c.4"),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi5_qup_clk.c,	NULL),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi6_qup_clk.c,	NULL),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi7_qup_clk.c,	NULL),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi8_qup_clk.c,	NULL),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi9_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi5_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi6_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi7_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi8_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi9_qup_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi10_qup_clk.c,	"qup_i2c.10"),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi11_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi11_qup_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi12_qup_clk.c,	"qup_i2c.12"),
 	CLK_LOOKUP("pdm_clk",		pdm_clk.c,		NULL),
 	CLK_LOOKUP("pmem_clk",		pmem_clk.c,		NULL),
@@ -4239,16 +4239,16 @@
 	CLK_LOOKUP("ce_clk",		ce1_core_clk.c,		NULL),
 	CLK_LOOKUP("dma_bam_pclk",	dma_bam_p_clk.c,	NULL),
 	CLK_LOOKUP("iface_clk",		gsbi1_p_clk.c,		"spi_qsd.0"),
-	CLK_LOOKUP("gsbi_pclk",		gsbi2_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi2_p_clk.c,		NULL),
 	CLK_LOOKUP("iface_clk",		gsbi3_p_clk.c,		"qup_i2c.3"),
 	CLK_LOOKUP("iface_clk",		gsbi4_p_clk.c,		"qup_i2c.4"),
 	CLK_LOOKUP("iface_clk",		gsbi5_p_clk.c,	"msm_serial_hsl.0"),
 	CLK_LOOKUP("iface_clk",		gsbi6_p_clk.c,  "msm_serial_hs.0"),
-	CLK_LOOKUP("gsbi_pclk",		gsbi7_p_clk.c,		NULL),
-	CLK_LOOKUP("gsbi_pclk",		gsbi8_p_clk.c,		NULL),
-	CLK_LOOKUP("gsbi_pclk",		gsbi9_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi7_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi8_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi9_p_clk.c,		NULL),
 	CLK_LOOKUP("iface_clk",		gsbi10_p_clk.c,		"qup_i2c.10"),
-	CLK_LOOKUP("gsbi_pclk",		gsbi11_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi11_p_clk.c,		NULL),
 	CLK_LOOKUP("iface_clk",		gsbi12_p_clk.c,		"qup_i2c.12"),
 	CLK_LOOKUP("tsif_pclk",		tsif_p_clk.c,		NULL),
 	CLK_LOOKUP("usb_fs_pclk",	usb_fs1_p_clk.c,	NULL),
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 0404f8a..0e82518 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3506,16 +3506,16 @@
 	CLK_LOOKUP("core_clk",		gsbi11_uart_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi12_uart_clk.c, "msm_serial_hsl.0"),
 	CLK_LOOKUP("core_clk",		gsbi1_qup_clk.c,	"spi_qsd.0"),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi2_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi2_qup_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi3_qup_clk.c,	"qup_i2c.0"),
 	CLK_LOOKUP("core_clk",		gsbi4_qup_clk.c,	"qup_i2c.1"),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi5_qup_clk.c,	NULL),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi6_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi5_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi6_qup_clk.c,	NULL),
 	CLK_LOOKUP("core_clk",		gsbi7_qup_clk.c,	"qup_i2c.4"),
 	CLK_LOOKUP("core_clk",		gsbi8_qup_clk.c,	"qup_i2c.3"),
 	CLK_LOOKUP("core_clk",		gsbi9_qup_clk.c,	"qup_i2c.2"),
 	CLK_LOOKUP("core_clk",		gsbi10_qup_clk.c,	"spi_qsd.1"),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi11_qup_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		gsbi11_qup_clk.c,	NULL),
 	CLK_LOOKUP("gsbi_qup_clk",	gsbi12_qup_clk.c,	"msm_dsps.0"),
 	CLK_LOOKUP("core_clk",		gsbi12_qup_clk.c,	"qup_i2c.5"),
 	CLK_LOOKUP("pdm_clk",		pdm_clk.c,		NULL),
@@ -3538,19 +3538,19 @@
 	CLK_LOOKUP("usb_fs_src_clk",	usb_fs2_src_clk.c,	NULL),
 	CLK_LOOKUP("ce_clk",		ce2_p_clk.c,		NULL),
 	CLK_LOOKUP("iface_clk",		gsbi1_p_clk.c,		"spi_qsd.0"),
-	CLK_LOOKUP("gsbi_pclk",		gsbi2_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi2_p_clk.c,		NULL),
 	CLK_LOOKUP("iface_clk",		gsbi3_p_clk.c, "msm_serial_hsl.2"),
 	CLK_LOOKUP("iface_clk",		gsbi3_p_clk.c,		"qup_i2c.0"),
 	CLK_LOOKUP("iface_clk",		gsbi4_p_clk.c,		"qup_i2c.1"),
-	CLK_LOOKUP("gsbi_pclk",		gsbi5_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi5_p_clk.c,		NULL),
 	CLK_LOOKUP("iface_clk",		gsbi6_p_clk.c, "msm_serial_hs.0"),
 	CLK_LOOKUP("iface_clk",		gsbi7_p_clk.c,		"qup_i2c.4"),
 	CLK_LOOKUP("iface_clk",		gsbi8_p_clk.c,		"qup_i2c.3"),
 	CLK_LOOKUP("iface_clk",		gsbi9_p_clk.c, "msm_serial_hsl.1"),
 	CLK_LOOKUP("iface_clk",		gsbi9_p_clk.c,		"qup_i2c.2"),
 	CLK_LOOKUP("iface_clk",		gsbi10_p_clk.c,		"spi_qsd.1"),
-	CLK_LOOKUP("gsbi_pclk",		gsbi11_p_clk.c,		NULL),
-	CLK_LOOKUP("gsbi_pclk",		gsbi12_p_clk.c, "msm_dsps.0"),
+	CLK_LOOKUP("iface_clk",		gsbi11_p_clk.c,		NULL),
+	CLK_LOOKUP("iface_clk",		gsbi12_p_clk.c,		NULL),
 	CLK_LOOKUP("iface_clk",		gsbi12_p_clk.c, "msm_serial_hsl.0"),
 	CLK_LOOKUP("iface_clk",		gsbi12_p_clk.c,		"qup_i2c.5"),
 	CLK_LOOKUP("ppss_pclk",		ppss_p_clk.c,		NULL),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 7ab2ccd..98e0c1d 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -503,13 +503,13 @@
 	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("gsbi_qup_clk",	GSBI1_QUP_CLK,		NULL, 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",		GSBI1_QUP_CLK,		NULL, 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,	 "spi_qsd.0", OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI6_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_qup_clk",	GSBI7_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",		GSBI6_QUP_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",		GSBI7_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),
@@ -535,13 +535,13 @@
 	CLK_DUMMY("sata_rxoob_clk",     SATA_RXOOB_CLK,         NULL, OFF),
 	CLK_DUMMY("sata_pmalive_clk",   SATA_PMALIVE_CLK,       NULL, OFF),
 	CLK_DUMMY("sata_phy_ref_clk",   SATA_PHY_REF_CLK,       NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI1_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI2_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI1_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI2_P_CLK,		NULL, OFF),
 	CLK_DUMMY("iface_clk",		GSBI3_P_CLK, "msm_serial_hsl.0", OFF),
 	CLK_DUMMY("iface_clk",		GSBI4_P_CLK,	 "qup_i2c.4", OFF),
 	CLK_DUMMY("iface_clk",		GSBI5_P_CLK,	 "spi_qsd.0", OFF),
 	CLK_DUMMY("iface_clk",		GSBI6_P_CLK,		NULL, OFF),
-	CLK_DUMMY("gsbi_pclk",		GSBI7_P_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		GSBI7_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_hs_pclk",	USB_HS1_P_CLK,		NULL, OFF),
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),