commit e1a86060db7ecb7be19cff9e16284cfd30410518
author Matt Wagantall <mattw@codeaurora.org> Thu Aug 18 17:46:10 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:49 2011 -0700
tree 57fef9e1977099f3584b7c730ed5c1dbf6e8b376
parent 37ce38431e6ce538e853daea8d309d5195d9c607

msm: clock: Use device names to distinguish between ADM clocks

Drivers should now use their device names to distinguish between
clocks of the same type rather than the clock name. This allows
the clock names to be updated to match the new naming convention.

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

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 55a1850f..c6c9162 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -142,7 +142,7 @@
 static DEFINE_CLK_VOTER(ebi_adm_clk,	&ebi1_clk.c);
 
 static struct clk_lookup msm_clocks_7x01a[] = {
-	CLK_LOOKUP("adm_clk",		adm_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		adm_clk.c,	"msm_dmov"),
 	CLK_LOOKUP("adsp_clk",		adsp_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_clk",		ebi1_clk.c,	NULL),
 	CLK_LOOKUP("ebi2_clk",		ebi2_clk.c,	NULL),
@@ -191,7 +191,7 @@
 };
 
 static struct clk_lookup msm_clocks_7x27[] = {
-	CLK_LOOKUP("adm_clk",		adm_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		adm_clk.c,	"msm_dmov"),
 	CLK_LOOKUP("adsp_clk",		adsp_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_clk",		ebi1_clk.c,	NULL),
 	CLK_LOOKUP("ebi2_clk",		ebi2_clk.c,	NULL),
@@ -241,7 +241,7 @@
 	CLK_LOOKUP("ebi1_mddi_clk",	ebi_mddi_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_usb_clk",	ebi_usb_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_vfe_clk",	ebi_vfe_clk.c,	NULL),
-	CLK_LOOKUP("ebi1_clk",		ebi_adm_clk.c,	"msm_dmov"),
+	CLK_LOOKUP("mem_clk",		ebi_adm_clk.c,	"msm_dmov"),
 };
 
 struct clock_init_data msm7x27_clock_init_data __initdata = {
@@ -250,7 +250,7 @@
 };
 
 static struct clk_lookup msm_clocks_7x27a[] = {
-	CLK_LOOKUP("adm_clk",		adm_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		adm_clk.c,	"msm_dmov"),
 	CLK_LOOKUP("adsp_clk",		adsp_clk.c,	NULL),
 	CLK_LOOKUP("ahb_m_clk",		ahb_m_clk.c,	NULL),
 	CLK_LOOKUP("ahb_s_clk",		ahb_s_clk.c,	NULL),
@@ -317,7 +317,7 @@
 	CLK_LOOKUP("ebi1_mddi_clk",	ebi_mddi_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_usb_clk",	ebi_usb_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_vfe_clk",	ebi_vfe_clk.c,	NULL),
-	CLK_LOOKUP("ebi1_clk",		ebi_adm_clk.c,	"msm_dmov"),
+	CLK_LOOKUP("mem_clk",		ebi_adm_clk.c,	"msm_dmov"),
 };
 
 struct clock_init_data msm7x27a_clock_init_data __initdata = {
@@ -326,7 +326,7 @@
 };
 
 static struct clk_lookup msm_clocks_8x50[] = {
-	CLK_LOOKUP("adm_clk",		adm_clk.c,	NULL),
+	CLK_LOOKUP("core_clk",		adm_clk.c,	"msm_dmov"),
 	CLK_LOOKUP("ce_clk",		ce_clk.c,		NULL),
 	CLK_LOOKUP("ebi1_clk",		ebi1_clk.c,	NULL),
 	CLK_LOOKUP("ebi2_clk",		ebi2_clk.c,	NULL),
@@ -386,7 +386,7 @@
 	CLK_LOOKUP("ebi1_tv_clk",	ebi_tv_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_usb_clk",	ebi_usb_clk.c,	NULL),
 	CLK_LOOKUP("ebi1_vfe_clk",	ebi_vfe_clk.c,	NULL),
-	CLK_LOOKUP("ebi1_clk",		ebi_adm_clk.c,	"msm_dmov"),
+	CLK_LOOKUP("mem_clk",		ebi_adm_clk.c,	"msm_dmov"),
 
 	CLK_LOOKUP("grp_pclk",		grp_3d_p_clk.c,	NULL),
 	CLK_LOOKUP("grp_2d_clk",	grp_2d_clk.c,	NULL),