commit ac294855f68a2411b0283163de1c45994a509a73
author Matt Wagantall <mattw@codeaurora.org> Wed Aug 17 15:44:58 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:43 2011 -0700
tree fbc09daa6de467a401e045fef2cc7e24efa9c693
parent 33dbc0052a6610c41fdb239e9e1aba9bac0ffa29

msm: clock: Rename all I2C/SPI clocks to 'core_clk' or "iface_clk"

Drivers should now use their device names to distinguish between
clocks of the same type rather than the clock name.

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

Conflicts:

	arch/arm/mach-msm/board-qrdc.c
	arch/arm/mach-msm/board-qt8660.c

arch/arm/mach-msm/clock-pcom-lookup.c

diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index ac32db4..d3411a1 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -150,7 +150,7 @@
 	CLK_LOOKUP("emdh_clk",		emdh_clk.c,	NULL),
 	CLK_LOOKUP("gp_clk",		gp_clk.c,		NULL),
 	CLK_LOOKUP("grp_clk",		grp_3d_clk.c,	NULL),
-	CLK_LOOKUP("i2c_clk",		i2c_clk.c,	"msm_i2c.0"),
+	CLK_LOOKUP("core_clk",		i2c_clk.c,	"msm_i2c.0"),
 	CLK_LOOKUP("icodec_rx_clk",	icodec_rx_clk.c,	NULL),
 	CLK_LOOKUP("icodec_tx_clk",	icodec_tx_clk.c,	NULL),
 	CLK_LOOKUP("imem_clk",		imem_clk.c,	NULL),
@@ -199,7 +199,7 @@
 	CLK_LOOKUP("gp_clk",		gp_clk.c,		NULL),
 	CLK_LOOKUP("grp_clk",		grp_3d_clk.c,	NULL),
 	CLK_LOOKUP("grp_pclk",		grp_3d_p_clk.c,	NULL),
-	CLK_LOOKUP("i2c_clk",		i2c_clk.c,	"msm_i2c.0"),
+	CLK_LOOKUP("core_clk",		i2c_clk.c,	"msm_i2c.0"),
 	CLK_LOOKUP("icodec_rx_clk",	icodec_rx_clk.c,	NULL),
 	CLK_LOOKUP("icodec_tx_clk",	icodec_tx_clk.c,	NULL),
 	CLK_LOOKUP("imem_clk",		imem_clk.c,	NULL),
@@ -272,10 +272,10 @@
 	CLK_LOOKUP("gp_clk",		gp_clk.c,	NULL),
 	CLK_LOOKUP("grp_clk",		grp_3d_clk.c,	NULL),
 	CLK_LOOKUP("grp_pclk",		grp_3d_p_clk.c,	NULL),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi1_qup_clk.c, "qup_i2c.0"),
-	CLK_LOOKUP("gsbi_qup_clk",	gsbi2_qup_clk.c, "qup_i2c.1"),
-	CLK_LOOKUP("gsbi_qup_pclk",	gsbi1_qup_p_clk.c, "qup_i2c.0"),
-	CLK_LOOKUP("gsbi_qup_pclk",	gsbi2_qup_p_clk.c, "qup_i2c.1"),
+	CLK_LOOKUP("core_clk",		gsbi1_qup_clk.c, "qup_i2c.0"),
+	CLK_LOOKUP("core_clk",		gsbi2_qup_clk.c, "qup_i2c.1"),
+	CLK_LOOKUP("iface_clk",		gsbi1_qup_p_clk.c, "qup_i2c.0"),
+	CLK_LOOKUP("iface_clk",		gsbi2_qup_p_clk.c, "qup_i2c.1"),
 	CLK_LOOKUP("icodec_rx_clk",	icodec_rx_clk.c, NULL),
 	CLK_LOOKUP("icodec_tx_clk",	icodec_tx_clk.c, NULL),
 	CLK_LOOKUP("imem_clk",		imem_clk.c,	NULL),
@@ -334,7 +334,7 @@
 	CLK_LOOKUP("emdh_clk",		emdh_clk.c,	NULL),
 	CLK_LOOKUP("gp_clk",		gp_clk.c,		NULL),
 	CLK_LOOKUP("grp_clk",		grp_3d_clk.c,	NULL),
-	CLK_LOOKUP("i2c_clk",		i2c_clk.c,	"msm_i2c.0"),
+	CLK_LOOKUP("core_clk",		i2c_clk.c,	"msm_i2c.0"),
 	CLK_LOOKUP("icodec_rx_clk",	icodec_rx_clk.c,	NULL),
 	CLK_LOOKUP("icodec_tx_clk",	icodec_tx_clk.c,	NULL),
 	CLK_LOOKUP("imem_clk",		imem_clk.c,	NULL),
@@ -355,8 +355,8 @@
 	CLK_LOOKUP("sdc_pclk",		sdc3_p_clk.c,	"msm_sdcc.3"),
 	CLK_LOOKUP("sdc_clk",		sdc4_clk.c,	"msm_sdcc.4"),
 	CLK_LOOKUP("sdc_pclk",		sdc4_p_clk.c,	"msm_sdcc.4"),
-	CLK_LOOKUP("spi_clk",		spi_clk.c,	NULL),
-	CLK_DUMMY("spi_pclk",		SPI_P_CLK,	"spi_qsd.0", 0),
+	CLK_LOOKUP("core_clk",		spi_clk.c,	"spi_qsd.0"),
+	CLK_DUMMY("iface_clk",		SPI_P_CLK,	"spi_qsd.0", 0),
 	CLK_LOOKUP("tsif_clk",		tsif_clk.c,	NULL),
 	CLK_LOOKUP("tsif_ref_clk",	tsif_ref_clk.c,	NULL),
 	CLK_LOOKUP("tv_dac_clk",	tv_dac_clk.c,	NULL),
@@ -391,8 +391,8 @@
 	CLK_LOOKUP("grp_pclk",		grp_3d_p_clk.c,	NULL),
 	CLK_LOOKUP("grp_2d_clk",	grp_2d_clk.c,	NULL),
 	CLK_LOOKUP("grp_2d_pclk",	grp_2d_p_clk.c,	NULL),
-	CLK_LOOKUP("qup_clk",		gsbi_clk.c,	"qup_i2c.4"),
-	CLK_LOOKUP("qup_pclk",		gsbi_p_clk.c,	"qup_i2c.4"),
+	CLK_LOOKUP("core_clk",		gsbi_clk.c,	"qup_i2c.4"),
+	CLK_LOOKUP("iface_clk",		gsbi_p_clk.c,	"qup_i2c.4"),
 };
 
 struct clock_init_data qds8x50_clock_init_data __initdata = {