commit 37ce38431e6ce538e853daea8d309d5195d9c607
author Matt Wagantall <mattw@codeaurora.org> Wed Aug 17 16:00:36 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:48 2011 -0700
tree b099e7a7241d397e5bae20156ca71973e88440be
parent 62cf63ea8ef44c3bb893045f1d8b440d298e2e35

msm: clock: Rename SDC clocks to match new naming convention

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

arch/arm/mach-msm/clock-8x60.c

diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 0e82518..1de4f60 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3521,11 +3521,11 @@
 	CLK_LOOKUP("pdm_clk",		pdm_clk.c,		NULL),
 	CLK_LOOKUP("pmem_clk",		pmem_clk.c,		NULL),
 	CLK_LOOKUP("prng_clk",		prng_clk.c,		NULL),
-	CLK_LOOKUP("sdc_clk",		sdc1_clk.c, "msm_sdcc.1"),
-	CLK_LOOKUP("sdc_clk",		sdc2_clk.c, "msm_sdcc.2"),
-	CLK_LOOKUP("sdc_clk",		sdc3_clk.c, "msm_sdcc.3"),
-	CLK_LOOKUP("sdc_clk",		sdc4_clk.c, "msm_sdcc.4"),
-	CLK_LOOKUP("sdc_clk",		sdc5_clk.c, "msm_sdcc.5"),
+	CLK_LOOKUP("core_clk",		sdc1_clk.c, "msm_sdcc.1"),
+	CLK_LOOKUP("core_clk",		sdc2_clk.c, "msm_sdcc.2"),
+	CLK_LOOKUP("core_clk",		sdc3_clk.c, "msm_sdcc.3"),
+	CLK_LOOKUP("core_clk",		sdc4_clk.c, "msm_sdcc.4"),
+	CLK_LOOKUP("core_clk",		sdc5_clk.c, "msm_sdcc.5"),
 	CLK_LOOKUP("tsif_ref_clk",	tsif_ref_clk.c,		NULL),
 	CLK_LOOKUP("tssc_clk",		tssc_clk.c,		NULL),
 	CLK_LOOKUP("usb_hs_clk",	usb_hs1_xcvr_clk.c,	NULL),
@@ -3558,11 +3558,11 @@
 	CLK_LOOKUP("usb_fs_pclk",	usb_fs1_p_clk.c,		NULL),
 	CLK_LOOKUP("usb_fs_pclk",	usb_fs2_p_clk.c,		NULL),
 	CLK_LOOKUP("usb_hs_pclk",	usb_hs1_p_clk.c,		NULL),
-	CLK_LOOKUP("sdc_pclk",		sdc1_p_clk.c, "msm_sdcc.1"),
-	CLK_LOOKUP("sdc_pclk",		sdc2_p_clk.c, "msm_sdcc.2"),
-	CLK_LOOKUP("sdc_pclk",		sdc3_p_clk.c, "msm_sdcc.3"),
-	CLK_LOOKUP("sdc_pclk",		sdc4_p_clk.c, "msm_sdcc.4"),
-	CLK_LOOKUP("sdc_pclk",		sdc5_p_clk.c, "msm_sdcc.5"),
+	CLK_LOOKUP("iface_clk",		sdc1_p_clk.c, "msm_sdcc.1"),
+	CLK_LOOKUP("iface_clk",		sdc2_p_clk.c, "msm_sdcc.2"),
+	CLK_LOOKUP("iface_clk",		sdc3_p_clk.c, "msm_sdcc.3"),
+	CLK_LOOKUP("iface_clk",		sdc4_p_clk.c, "msm_sdcc.4"),
+	CLK_LOOKUP("iface_clk",		sdc5_p_clk.c, "msm_sdcc.5"),
 	CLK_LOOKUP("adm_clk",		adm0_clk.c, "msm_dmov.0"),
 	CLK_LOOKUP("adm_pclk",		adm0_p_clk.c, "msm_dmov.0"),
 	CLK_LOOKUP("adm_clk",		adm1_clk.c, "msm_dmov.1"),
@@ -3657,11 +3657,11 @@
 
 	CLK_LOOKUP("dfab_dsps_clk",	dfab_dsps_clk.c, NULL),
 	CLK_LOOKUP("dfab_usb_hs_clk",	dfab_usb_hs_clk.c, NULL),
-	CLK_LOOKUP("dfab_sdc_clk",	dfab_sdc1_clk.c, "msm_sdcc.1"),
-	CLK_LOOKUP("dfab_sdc_clk",	dfab_sdc2_clk.c, "msm_sdcc.2"),
-	CLK_LOOKUP("dfab_sdc_clk",	dfab_sdc3_clk.c, "msm_sdcc.3"),
-	CLK_LOOKUP("dfab_sdc_clk",	dfab_sdc4_clk.c, "msm_sdcc.4"),
-	CLK_LOOKUP("dfab_sdc_clk",	dfab_sdc5_clk.c, "msm_sdcc.5"),
+	CLK_LOOKUP("bus_clk",		dfab_sdc1_clk.c, "msm_sdcc.1"),
+	CLK_LOOKUP("bus_clk",		dfab_sdc2_clk.c, "msm_sdcc.2"),
+	CLK_LOOKUP("bus_clk",		dfab_sdc3_clk.c, "msm_sdcc.3"),
+	CLK_LOOKUP("bus_clk",		dfab_sdc4_clk.c, "msm_sdcc.4"),
+	CLK_LOOKUP("bus_clk",		dfab_sdc5_clk.c, "msm_sdcc.5"),
 
 	CLK_LOOKUP("ebi1_msmbus_clk",	ebi1_msmbus_clk.c, NULL),
 	CLK_LOOKUP("ebi1_clk",		ebi1_adm0_clk.c, "msm_dmov.0"),