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>
diff --git a/arch/arm/mach-msm/clock-7x30.c b/arch/arm/mach-msm/clock-7x30.c
index 9874929..63f51da 100644
--- a/arch/arm/mach-msm/clock-7x30.c
+++ b/arch/arm/mach-msm/clock-7x30.c
@@ -2750,7 +2750,7 @@
{ CLK_LOOKUP("ebi1_tv_clk", ebi_tv_clk.c, NULL) },
{ CLK_LOOKUP("ebi1_vcd_clk", ebi_vcd_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") },
/*
* This is a many-to-one mapping because we don't know how the remote
@@ -2843,8 +2843,8 @@
OWN(APPS3, 2, "mfc_pclk", mfc_p_clk, NULL),
OWN(APPS3, 4, "vpe_clk", vpe_clk, NULL),
- OWN(GLBL, 8, "adm_clk", adm_clk, NULL),
- { CLK_LOOKUP("adm_pclk", adm_p_clk.c, NULL),
+ OWN(GLBL, 8, "core_clk", adm_clk, "msm_dmov"),
+ { CLK_LOOKUP("iface_clk", adm_p_clk.c, "msm_dmov"),
O(GLBL), BIT(13), &dummy_clk },
OWN(GLBL, 8, "ce_clk", ce_clk, NULL),
OWN(GLBL, 13, "rotator_clk", axi_rotator_clk, NULL),