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-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 1de4f60..fed9d38 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3563,10 +3563,10 @@
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"),
- CLK_LOOKUP("adm_pclk", adm1_p_clk.c, "msm_dmov.1"),
+ CLK_LOOKUP("core_clk", adm0_clk.c, "msm_dmov.0"),
+ CLK_LOOKUP("iface_clk", adm0_p_clk.c, "msm_dmov.0"),
+ CLK_LOOKUP("core_clk", adm1_clk.c, "msm_dmov.1"),
+ CLK_LOOKUP("iface_clk", adm1_p_clk.c, "msm_dmov.1"),
CLK_LOOKUP("modem_ahb1_pclk", modem_ahb1_p_clk.c, NULL),
CLK_LOOKUP("modem_ahb2_pclk", modem_ahb2_p_clk.c, NULL),
CLK_LOOKUP("pmic_arb_pclk", pmic_arb0_p_clk.c, NULL),
@@ -3664,8 +3664,8 @@
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"),
- CLK_LOOKUP("ebi1_clk", ebi1_adm1_clk.c, "msm_dmov.1"),
+ CLK_LOOKUP("mem_clk", ebi1_adm0_clk.c, "msm_dmov.0"),
+ CLK_LOOKUP("mem_clk", ebi1_adm1_clk.c, "msm_dmov.1"),
CLK_LOOKUP("sc0_mclk", sc0_m_clk, NULL),
CLK_LOOKUP("sc1_mclk", sc1_m_clk, NULL),