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),
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 78b1bf0..e875b0a 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4259,8 +4259,8 @@
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, NULL),
- CLK_LOOKUP("adm_pclk", adm0_p_clk.c, NULL),
+ CLK_LOOKUP("core_clk", adm0_clk.c, "msm_dmov"),
+ CLK_LOOKUP("iface_clk", adm0_p_clk.c, "msm_dmov"),
CLK_LOOKUP("pmic_arb_pclk", pmic_arb0_p_clk.c, NULL),
CLK_LOOKUP("pmic_arb_pclk", pmic_arb1_p_clk.c, NULL),
CLK_LOOKUP("pmic_ssbi2", pmic_ssbi2_clk.c, NULL),
@@ -4379,7 +4379,7 @@
CLK_LOOKUP("dfab_clk", dfab_sps_clk.c, "msm_sps"),
CLK_LOOKUP("ebi1_msmbus_clk", ebi1_msmbus_clk.c, NULL),
- CLK_LOOKUP("ebi1_clk", ebi1_adm_clk.c, "msm_dmov"),
+ CLK_LOOKUP("mem_clk", ebi1_adm_clk.c, "msm_dmov"),
CLK_LOOKUP("l2_mclk", l2_m_clk, NULL),
CLK_LOOKUP("krait0_mclk", krait0_m_clk, NULL),
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),
diff --git a/arch/arm/mach-msm/clock-fsm9xxx.c b/arch/arm/mach-msm/clock-fsm9xxx.c
index e3209d2..4b17635 100644
--- a/arch/arm/mach-msm/clock-fsm9xxx.c
+++ b/arch/arm/mach-msm/clock-fsm9xxx.c
@@ -22,7 +22,7 @@
*/
static struct clk_lookup msm_clocks_fsm9xxx[] = {
- CLK_DUMMY("adm_clk", ADM0_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", ADM0_CLK, "msm_dmov", OFF),
CLK_DUMMY("core_clk", UART1_CLK, "msm_serial.0", OFF),
CLK_DUMMY("ce_clk", CE_CLK, NULL, OFF),
};
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),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 2b8f510..37a9594 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -551,8 +551,8 @@
CLK_DUMMY("iface_clk", SDC2_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC3_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC4_P_CLK, NULL, OFF),
- CLK_DUMMY("adm_clk", ADM0_CLK, NULL, OFF),
- CLK_DUMMY("adm_pclk", ADM0_P_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", ADM0_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", ADM0_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_arb_pclk", PMIC_ARB0_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_arb_pclk", PMIC_ARB1_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_ssbi2", PMIC_SSBI2_CLK, NULL, OFF),
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 2b68175..390608f 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1504,8 +1504,8 @@
CLK_DUMMY("iface_clk", SDC3_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC4_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC5_P_CLK, NULL, OFF),
- CLK_DUMMY("adm_clk", ADM0_CLK, NULL, OFF),
- CLK_DUMMY("adm_pclk", ADM0_P_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", ADM0_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", ADM0_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_arb_pclk", PMIC_ARB0_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_arb_pclk", PMIC_ARB1_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_ssbi2", PMIC_SSBI2_CLK, NULL, OFF),
diff --git a/arch/arm/mach-msm/devices-msm7x25.c b/arch/arm/mach-msm/devices-msm7x25.c
index 83afed1..758230b 100644
--- a/arch/arm/mach-msm/devices-msm7x25.c
+++ b/arch/arm/mach-msm/devices-msm7x25.c
@@ -925,7 +925,7 @@
static DEFINE_CLK_PCOM(vfe_mdc_clk, VFE_MDC_CLK, OFF);
struct clk_lookup msm_clocks_7x25[] = {
- 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),
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index f63be92..7aecb66 100644
--- a/arch/arm/mach-msm/dma.c
+++ b/arch/arm/mach-msm/dma.c
@@ -690,20 +690,20 @@
int adm = (pdev->id >= 0) ? pdev->id : 0;
int ret;
- dmov_conf[adm].clk = clk_get(&pdev->dev, "adm_clk");
+ dmov_conf[adm].clk = clk_get(&pdev->dev, "core_clk");
if (IS_ERR(dmov_conf[adm].clk)) {
printk(KERN_ERR "%s: Error getting adm_clk\n", __func__);
dmov_conf[adm].clk = NULL;
return -ENOENT;
}
- dmov_conf[adm].pclk = clk_get(&pdev->dev, "adm_pclk");
+ dmov_conf[adm].pclk = clk_get(&pdev->dev, "iface_clk");
if (IS_ERR(dmov_conf[adm].pclk)) {
dmov_conf[adm].pclk = NULL;
/* pclk not present on all SoCs, don't bail on failure */
}
- dmov_conf[adm].ebiclk = clk_get(&pdev->dev, "ebi1_clk");
+ dmov_conf[adm].ebiclk = clk_get(&pdev->dev, "mem_clk");
if (IS_ERR(dmov_conf[adm].ebiclk)) {
dmov_conf[adm].ebiclk = NULL;
/* ebiclk not present on all SoCs, don't bail on failure */