msm: kgsl: Use device names to distinguish between graphics clocks
Distinguish between similar clocks on different cores using the
device struct passed to clk_get(). This allows for a common
clock naming convention that spans across targets.
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 3e50077..553a10f 100644
--- a/arch/arm/mach-msm/clock-7x30.c
+++ b/arch/arm/mach-msm/clock-7x30.c
@@ -2359,7 +2359,8 @@
static DEFINE_CLK_PCOM(p_rotator_p_clk, ROTATOR_P_CLK, 0);
static DEFINE_CLK_VOTER(ebi_dtv_clk, &ebi1_fixed_clk.c);
-static DEFINE_CLK_VOTER(ebi_kgsl_clk, &ebi1_fixed_clk.c);
+static DEFINE_CLK_VOTER(ebi_grp_3d_clk, &ebi1_fixed_clk.c);
+static DEFINE_CLK_VOTER(ebi_grp_2d_clk, &ebi1_fixed_clk.c);
static DEFINE_CLK_VOTER(ebi_lcdc_clk, &ebi1_fixed_clk.c);
static DEFINE_CLK_VOTER(ebi_mddi_clk, &ebi1_fixed_clk.c);
static DEFINE_CLK_VOTER(ebi_tv_clk, &ebi1_fixed_clk.c);
@@ -2744,7 +2745,8 @@
/* Voters */
{ CLK_LOOKUP("ebi1_dtv_clk", ebi_dtv_clk.c, NULL) },
- { CLK_LOOKUP("ebi1_kgsl_clk", ebi_kgsl_clk.c, NULL) },
+ { CLK_LOOKUP("bus_clk", ebi_grp_2d_clk.c, "kgsl-2d0.0") },
+ { CLK_LOOKUP("bus_clk", ebi_grp_3d_clk.c, "kgsl-3d0.0") },
{ CLK_LOOKUP("ebi1_lcdc_clk", ebi_lcdc_clk.c, NULL) },
{ CLK_LOOKUP("ebi1_mddi_clk", ebi_mddi_clk.c, NULL) },
{ CLK_LOOKUP("ebi1_tv_clk", ebi_tv_clk.c, NULL) },
@@ -2759,9 +2761,9 @@
* clocks going into a block by checking the ownership bit of one
* register (usually the ns register).
*/
- OWN(APPS1, 6, "grp_2d_clk", grp_2d_clk, NULL),
+ OWN(APPS1, 6, "core_clk", grp_2d_clk, "kgsl-2d0.0"),
OWN(APPS1, 6, "core_clk", grp_2d_clk, "footswitch-pcom.0"),
- OWN(APPS1, 6, "grp_2d_pclk", grp_2d_p_clk, NULL),
+ OWN(APPS1, 6, "iface_clk", grp_2d_p_clk, "kgsl-2d0.0"),
OWN(APPS1, 6, "iface_clk", grp_2d_p_clk, "footswitch-pcom.0"),
OWN(APPS1, 31, "hdmi_clk", hdmi_clk, NULL),
OWN(APPS1, 0, "jpeg_clk", jpeg_clk, NULL),
@@ -2786,15 +2788,15 @@
OWN(APPS1, 8, "vfe_pclk", vfe_p_clk, NULL),
OWN(APPS1, 8, "iface_clk", vfe_p_clk, "footswitch-pcom.8"),
- OWN(APPS2, 0, "grp_clk", grp_3d_clk, NULL),
+ OWN(APPS2, 0, "core_clk", grp_3d_clk, "kgsl-3d0.0"),
OWN(APPS2, 0, "core_clk", grp_3d_clk, "footswitch-pcom.2"),
- OWN(APPS2, 0, "grp_pclk", grp_3d_p_clk, NULL),
+ OWN(APPS2, 0, "iface_clk", grp_3d_p_clk, "kgsl-3d0.0"),
OWN(APPS2, 0, "iface_clk", grp_3d_p_clk, "footswitch-pcom.2"),
- { CLK_LOOKUP("grp_src_clk", grp_3d_src_clk.c, NULL),
+ { CLK_LOOKUP("src_clk", grp_3d_src_clk.c, "kgsl-3d0.0"),
O(APPS2), BIT(0), &p_grp_3d_clk.c },
{ CLK_LOOKUP("src_clk", grp_3d_src_clk.c, "footswitch-pcom.2"),
O(APPS2), BIT(0), &p_grp_3d_clk.c },
- OWN(APPS2, 0, "imem_clk", imem_clk, NULL),
+ OWN(APPS2, 0, "mem_clk", imem_clk, "kgsl-3d0.0"),
OWN(APPS2, 4, "mdp_lcdc_pad_pclk_clk", mdp_lcdc_pad_pclk_clk, NULL),
OWN(APPS2, 4, "mdp_lcdc_pclk_clk", mdp_lcdc_pclk_clk, NULL),
OWN(APPS2, 4, "mdp_pclk", mdp_p_clk, NULL),
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 54cb1de..5d3c845 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4625,11 +4625,11 @@
CLK_LOOKUP("dsi_byte_div_clk", dsi2_byte_clk.c, NULL),
CLK_LOOKUP("dsi_esc_clk", dsi1_esc_clk.c, NULL),
CLK_LOOKUP("dsi_esc_clk", dsi2_esc_clk.c, NULL),
- CLK_LOOKUP("gfx2d0_clk", gfx2d0_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gfx2d0_clk.c, "kgsl-2d0.0"),
CLK_LOOKUP("core_clk", gfx2d0_clk.c, "footswitch-8x60.0"),
- CLK_LOOKUP("gfx2d1_clk", gfx2d1_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gfx2d1_clk.c, "kgsl-2d1.1"),
CLK_LOOKUP("core_clk", gfx2d1_clk.c, "footswitch-8x60.1"),
- CLK_LOOKUP("gfx3d_clk", gfx3d_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gfx3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", gfx3d_clk.c, "footswitch-8x60.2"),
CLK_LOOKUP("bus_clk", ijpeg_axi_clk.c, "footswitch-8x60.3"),
CLK_LOOKUP("imem_axi_clk", imem_axi_clk.c, NULL),
@@ -4674,18 +4674,18 @@
CLK_LOOKUP("dsi_s_pclk", dsi1_s_p_clk.c, NULL),
CLK_LOOKUP("dsi_m_pclk", dsi2_m_p_clk.c, NULL),
CLK_LOOKUP("dsi_s_pclk", dsi2_s_p_clk.c, NULL),
- CLK_LOOKUP("gfx2d0_pclk", gfx2d0_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", gfx2d0_p_clk.c, "kgsl-2d0.0"),
CLK_LOOKUP("iface_clk", gfx2d0_p_clk.c, "footswitch-8x60.0"),
- CLK_LOOKUP("gfx2d1_pclk", gfx2d1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "kgsl-2d1.1"),
CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "footswitch-8x60.1"),
- CLK_LOOKUP("gfx3d_pclk", gfx3d_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", gfx3d_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("iface_clk", gfx3d_p_clk.c, "footswitch-8x60.2"),
CLK_LOOKUP("hdmi_m_pclk", hdmi_m_p_clk.c, NULL),
CLK_LOOKUP("hdmi_s_pclk", hdmi_s_p_clk.c, NULL),
CLK_LOOKUP("ijpeg_pclk", ijpeg_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", ijpeg_p_clk.c, "footswitch-8x60.3"),
CLK_LOOKUP("jpegd_pclk", jpegd_p_clk.c, NULL),
- CLK_LOOKUP("imem_pclk", imem_p_clk.c, NULL),
+ CLK_LOOKUP("mem_iface_clk", imem_p_clk.c, NULL),
CLK_LOOKUP("mdp_pclk", mdp_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "footswitch-8x60.4"),
CLK_LOOKUP("smmu_pclk", smmu_p_clk.c, NULL),
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index fbefc47..c436a19 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3618,11 +3618,11 @@
CLK_LOOKUP("csi_src_clk", csi_src_clk.c, NULL),
CLK_LOOKUP("dsi_byte_div_clk", dsi_byte_clk.c, NULL),
CLK_LOOKUP("dsi_esc_clk", dsi_esc_clk.c, NULL),
- CLK_LOOKUP("gfx2d0_clk", gfx2d0_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gfx2d0_clk.c, "kgsl-2d0.0"),
CLK_LOOKUP("core_clk", gfx2d0_clk.c, "footswitch-8x60.0"),
- CLK_LOOKUP("gfx2d1_clk", gfx2d1_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gfx2d1_clk.c, "kgsl-2d1.1"),
CLK_LOOKUP("core_clk", gfx2d1_clk.c, "footswitch-8x60.1"),
- CLK_LOOKUP("gfx3d_clk", gfx3d_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gfx3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", gfx3d_clk.c, "footswitch-8x60.2"),
CLK_LOOKUP("ijpeg_clk", ijpeg_clk.c, NULL),
CLK_LOOKUP("core_clk", ijpeg_clk.c, "footswitch-8x60.3"),
@@ -3653,7 +3653,7 @@
CLK_LOOKUP("smmu_vfe_clk", vfe_axi_clk.c, NULL),
CLK_LOOKUP("bus_clk", vfe_axi_clk.c, "footswitch-8x60.8"),
CLK_LOOKUP("bus_clk", ijpeg_axi_clk.c, "footswitch-8x60.3"),
- CLK_LOOKUP("imem_axi_clk", imem_axi_clk.c, NULL),
+ CLK_LOOKUP("mem_clk", imem_axi_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("bus_clk", mdp_axi_clk.c, "footswitch-8x60.4"),
CLK_LOOKUP("bus_clk", rot_axi_clk.c, "footswitch-8x60.6"),
CLK_LOOKUP("bus_clk", vcodec_axi_clk.c, "footswitch-8x60.7"),
@@ -3664,18 +3664,18 @@
CLK_LOOKUP("csi_pclk", csi1_p_clk.c, "msm_camera_ov9726.0"),
CLK_LOOKUP("dsi_m_pclk", dsi_m_p_clk.c, NULL),
CLK_LOOKUP("dsi_s_pclk", dsi_s_p_clk.c, NULL),
- CLK_LOOKUP("gfx2d0_pclk", gfx2d0_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", gfx2d0_p_clk.c, "kgsl-2d0.0"),
CLK_LOOKUP("iface_clk", gfx2d0_p_clk.c, "footswitch-8x60.0"),
- CLK_LOOKUP("gfx2d1_pclk", gfx2d1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "kgsl-2d1.1"),
CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "footswitch-8x60.1"),
- CLK_LOOKUP("gfx3d_pclk", gfx3d_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", gfx3d_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("iface_clk", gfx3d_p_clk.c, "footswitch-8x60.2"),
CLK_LOOKUP("hdmi_m_pclk", hdmi_m_p_clk.c, NULL),
CLK_LOOKUP("hdmi_s_pclk", hdmi_s_p_clk.c, NULL),
CLK_LOOKUP("ijpeg_pclk", ijpeg_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", ijpeg_p_clk.c, "footswitch-8x60.3"),
CLK_LOOKUP("jpegd_pclk", jpegd_p_clk.c, NULL),
- CLK_LOOKUP("imem_pclk", imem_p_clk.c, NULL),
+ CLK_LOOKUP("mem_iface_clk", imem_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("mdp_pclk", mdp_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "footswitch-8x60.4"),
CLK_LOOKUP("smmu_pclk", smmu_p_clk.c, NULL),
diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index 1c378df..9a5e644 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -133,7 +133,8 @@
static DEFINE_CLK_PCOM(vfe_mdc_clk, VFE_MDC_CLK, 0);
static DEFINE_CLK_VOTER(ebi_acpu_clk, &ebi1_clk.c);
-static DEFINE_CLK_VOTER(ebi_kgsl_clk, &ebi1_clk.c);
+static DEFINE_CLK_VOTER(ebi_grp_3d_clk, &ebi1_clk.c);
+static DEFINE_CLK_VOTER(ebi_grp_2d_clk, &ebi1_clk.c);
static DEFINE_CLK_VOTER(ebi_lcdc_clk, &ebi1_clk.c);
static DEFINE_CLK_VOTER(ebi_mddi_clk, &ebi1_clk.c);
static DEFINE_CLK_VOTER(ebi_tv_clk, &ebi1_clk.c);
@@ -149,11 +150,11 @@
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
CLK_LOOKUP("emdh_clk", emdh_clk.c, NULL),
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
- CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
+ CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
- CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
+ CLK_LOOKUP("mem_clk", imem_clk.c, NULL),
CLK_LOOKUP("mdc_clk", mdc_clk.c, NULL),
CLK_LOOKUP("mddi_clk", pmdh_clk.c, NULL),
CLK_LOOKUP("mdp_clk", mdp_clk.c, NULL),
@@ -197,14 +198,14 @@
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
- CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
+ CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "footswitch-pcom.2"),
- CLK_LOOKUP("grp_pclk", grp_3d_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", grp_3d_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("iface_clk", grp_3d_p_clk.c, "footswitch-pcom.2"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
- CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
+ CLK_LOOKUP("mem_clk", imem_clk.c, NULL),
CLK_LOOKUP("mdc_clk", mdc_clk.c, NULL),
CLK_LOOKUP("mddi_clk", pmdh_clk.c, NULL),
CLK_LOOKUP("mdp_clk", mdp_clk.c, NULL),
@@ -240,7 +241,7 @@
CLK_LOOKUP("vfe_mdc_clk", vfe_mdc_clk.c, NULL),
CLK_LOOKUP("ebi1_acpu_clk", ebi_acpu_clk.c, NULL),
- CLK_LOOKUP("ebi1_kgsl_clk", ebi_kgsl_clk.c, NULL),
+ CLK_LOOKUP("bus_clk", ebi_grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("ebi1_lcdc_clk", ebi_lcdc_clk.c, NULL),
CLK_LOOKUP("ebi1_mddi_clk", ebi_mddi_clk.c, NULL),
CLK_LOOKUP("ebi1_usb_clk", ebi_usb_clk.c, NULL),
@@ -274,9 +275,9 @@
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
- CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
+ CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", grp_3d_clk.c, "footswitch-pcom.2"),
- CLK_LOOKUP("grp_pclk", grp_3d_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", grp_3d_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("iface_clk", grp_3d_p_clk.c, "footswitch-pcom.2"),
CLK_LOOKUP("core_clk", gsbi1_qup_clk.c, "qup_i2c.0"),
CLK_LOOKUP("core_clk", gsbi2_qup_clk.c, "qup_i2c.1"),
@@ -284,7 +285,7 @@
CLK_LOOKUP("iface_clk", gsbi2_qup_p_clk.c, "qup_i2c.1"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
- CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
+ CLK_LOOKUP("mem_clk", imem_clk.c, NULL),
CLK_LOOKUP("mddi_clk", pmdh_clk.c, NULL),
CLK_LOOKUP("mdp_clk", mdp_clk.c, NULL),
CLK_LOOKUP("mdp_lcdc_pclk_clk", mdp_lcdc_pclk_clk.c, NULL),
@@ -320,7 +321,7 @@
CLK_LOOKUP("vfe_mdc_clk", vfe_mdc_clk.c, NULL),
CLK_LOOKUP("ebi1_acpu_clk", ebi_acpu_clk.c, NULL),
- CLK_LOOKUP("ebi1_kgsl_clk", ebi_kgsl_clk.c, NULL),
+ CLK_LOOKUP("bus_clk", ebi_grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("ebi1_lcdc_clk", ebi_lcdc_clk.c, NULL),
CLK_LOOKUP("ebi1_mddi_clk", ebi_mddi_clk.c, NULL),
CLK_LOOKUP("ebi1_usb_clk", ebi_usb_clk.c, NULL),
@@ -341,11 +342,11 @@
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
CLK_LOOKUP("emdh_clk", emdh_clk.c, NULL),
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
- CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
+ CLK_LOOKUP("core_clk", grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
- CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
+ CLK_LOOKUP("mem_clk", imem_clk.c, NULL),
CLK_LOOKUP("mdc_clk", mdc_clk.c, NULL),
CLK_LOOKUP("mddi_clk", pmdh_clk.c, NULL),
CLK_LOOKUP("mdp_clk", mdp_clk.c, NULL),
@@ -388,7 +389,8 @@
CLK_LOOKUP("usb_phy_clk", usb_phy_clk.c, NULL),
CLK_LOOKUP("ebi1_acpu_clk", ebi_acpu_clk.c, NULL),
- CLK_LOOKUP("ebi1_kgsl_clk", ebi_kgsl_clk.c, NULL),
+ CLK_LOOKUP("bus_clk", ebi_grp_3d_clk.c, "kgsl-3d0.0"),
+ CLK_LOOKUP("bus_clk", ebi_grp_2d_clk.c, "kgsl-2d0.0"),
CLK_LOOKUP("ebi1_lcdc_clk", ebi_lcdc_clk.c, NULL),
CLK_LOOKUP("ebi1_mddi_clk", ebi_mddi_clk.c, NULL),
CLK_LOOKUP("ebi1_tv_clk", ebi_tv_clk.c, NULL),
@@ -396,9 +398,9 @@
CLK_LOOKUP("ebi1_vfe_clk", ebi_vfe_clk.c, NULL),
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),
- CLK_LOOKUP("grp_2d_pclk", grp_2d_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", grp_3d_p_clk.c, "kgsl-3d0.0"),
+ CLK_LOOKUP("core_clk", grp_2d_clk.c, "kgsl-2d0.0"),
+ CLK_LOOKUP("iface_clk", grp_2d_p_clk.c, "kgsl-2d0.0"),
CLK_LOOKUP("core_clk", gsbi_clk.c, "qup_i2c.4"),
CLK_LOOKUP("iface_clk", gsbi_p_clk.c, "qup_i2c.4"),
};
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 1b9a3b7..98233fc 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -614,11 +614,11 @@
CLK_DUMMY("dsi_byte_div_clk", DSI2_BYTE_CLK, NULL, OFF),
CLK_DUMMY("dsi_esc_clk", DSI1_ESC_CLK, NULL, OFF),
CLK_DUMMY("dsi_esc_clk", DSI2_ESC_CLK, NULL, OFF),
- CLK_DUMMY("vcap_clk", VCAP_CLK, NULL, OFF),
- CLK_DUMMY("vcap_npl_clk", VCAP_NPL_CLK, NULL, OFF),
- CLK_DUMMY("gfx3d_clk", GFX3D_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", VCAP_CLK, NULL, OFF),
+ CLK_DUMMY("npl_clk", VCAP_NPL_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GFX3D_CLK, NULL, OFF),
CLK_DUMMY("ijpeg_clk", IJPEG_CLK, NULL, OFF),
- CLK_DUMMY("imem_clk", IMEM_CLK, NULL, OFF),
+ CLK_DUMMY("mem_clk", IMEM_CLK, NULL, OFF),
CLK_DUMMY("jpegd_clk", JPEGD_CLK, NULL, OFF),
CLK_DUMMY("mdp_clk", MDP_CLK, NULL, OFF),
CLK_DUMMY("mdp_vsync_clk", MDP_VSYNC_CLK, NULL, OFF),
@@ -642,7 +642,7 @@
CLK_DUMMY("vcodec_axi_a_clk", VCODEC_AXI_A_CLK, NULL, OFF),
CLK_DUMMY("vcodec_axi_b_clk", VCODEC_AXI_B_CLK, NULL, OFF),
CLK_DUMMY("vpe_axi_clk", VPE_AXI_CLK, NULL, OFF),
- CLK_DUMMY("gfx3d_axi_clk", GFX3D_AXI_CLK, NULL, OFF),
+ CLK_DUMMY("bus_clk", GFX3D_AXI_CLK, NULL, OFF),
CLK_DUMMY("vcap_axi_clk", VCAP_AXI_CLK, NULL, OFF),
CLK_DUMMY("vcap_ahb_clk", VCAP_AHB_CLK, NULL, OFF),
CLK_DUMMY("amp_pclk", AMP_P_CLK, NULL, OFF),
@@ -655,12 +655,12 @@
CLK_DUMMY("mdp_p2clk", MDP_P2CLK, NULL, OFF),
CLK_DUMMY("dsi2_pixel_clk", DSI2_PIXEL_CLK, NULL, OFF),
CLK_DUMMY("lvds_ref_clk", LVDS_REF_CLK, NULL, OFF),
- CLK_DUMMY("gfx3d_pclk", GFX3D_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", GFX3D_P_CLK, NULL, OFF),
CLK_DUMMY("hdmi_m_pclk", HDMI_M_P_CLK, NULL, OFF),
CLK_DUMMY("hdmi_s_pclk", HDMI_S_P_CLK, NULL, OFF),
CLK_DUMMY("ijpeg_pclk", IJPEG_P_CLK, NULL, OFF),
CLK_DUMMY("jpegd_pclk", JPEGD_P_CLK, NULL, OFF),
- CLK_DUMMY("imem_pclk", IMEM_P_CLK, NULL, OFF),
+ CLK_DUMMY("mem_iface_clk", IMEM_P_CLK, NULL, OFF),
CLK_DUMMY("mdp_pclk", MDP_P_CLK, NULL, OFF),
CLK_DUMMY("smmu_pclk", SMMU_P_CLK, NULL, OFF),
CLK_DUMMY("rotator_pclk", ROT_P_CLK, NULL, OFF),
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 7dbcafe..4ba71db 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1579,11 +1579,11 @@
CLK_DUMMY("dsi_byte_div_clk", DSI2_BYTE_CLK, "mipi_dsi.2", OFF),
CLK_DUMMY("dsi_esc_clk", DSI1_ESC_CLK, "mipi_dsi.1", OFF),
CLK_DUMMY("dsi_esc_clk", DSI2_ESC_CLK, "mipi_dsi.2", OFF),
- CLK_DUMMY("gfx2d0_clk", GFX2D0_CLK, NULL, OFF),
- CLK_DUMMY("gfx2d1_clk", GFX2D1_CLK, NULL, OFF),
- CLK_DUMMY("gfx3d_clk", GFX3D_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GFX2D0_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GFX2D1_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GFX3D_CLK, NULL, OFF),
CLK_DUMMY("ijpeg_clk", IJPEG_CLK, NULL, OFF),
- CLK_DUMMY("imem_clk", IMEM_CLK, NULL, OFF),
+ CLK_DUMMY("mem_clk", IMEM_CLK, NULL, OFF),
CLK_DUMMY("jpegd_clk", JPEGD_CLK, NULL, OFF),
CLK_DUMMY("mdp_clk", MDP_CLK, NULL, OFF),
CLK_DUMMY("mdp_vsync_clk", MDP_VSYNC_CLK, NULL, OFF),
@@ -1613,14 +1613,14 @@
CLK_DUMMY("dsi_s_pclk", DSI1_S_P_CLK, "mipi_dsi.1", OFF),
CLK_DUMMY("dsi_m_pclk", DSI2_M_P_CLK, "mipi_dsi.2", OFF),
CLK_DUMMY("dsi_s_pclk", DSI2_S_P_CLK, "mipi_dsi.2", OFF),
- CLK_DUMMY("gfx2d0_pclk", GFX2D0_P_CLK, NULL, OFF),
- CLK_DUMMY("gfx2d1_pclk", GFX2D1_P_CLK, NULL, OFF),
- CLK_DUMMY("gfx3d_pclk", GFX3D_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", GFX2D0_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", GFX2D1_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", GFX3D_P_CLK, NULL, OFF),
CLK_DUMMY("hdmi_m_pclk", HDMI_M_P_CLK, NULL, OFF),
CLK_DUMMY("hdmi_s_pclk", HDMI_S_P_CLK, NULL, OFF),
CLK_DUMMY("ijpeg_pclk", IJPEG_P_CLK, NULL, OFF),
CLK_DUMMY("jpegd_pclk", JPEGD_P_CLK, NULL, OFF),
- CLK_DUMMY("imem_pclk", IMEM_P_CLK, NULL, OFF),
+ CLK_DUMMY("mem_iface_clk", IMEM_P_CLK, NULL, OFF),
CLK_DUMMY("mdp_pclk", MDP_P_CLK, NULL, OFF),
CLK_DUMMY("smmu_pclk", SMMU_P_CLK, NULL, OFF),
CLK_DUMMY("rotator_pclk", ROT_P_CLK, NULL, OFF),
@@ -1895,8 +1895,8 @@
},
.clk = {
.name = {
- .clk = "gfx3d_clk",
- .pclk = "gfx3d_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
#ifdef CONFIG_MSM_BUS_SCALING
.bus_scale_table = &grp3d_bus_scale_pdata,
@@ -1904,7 +1904,7 @@
},
.imem_clk_name = {
.clk = NULL,
- .pclk = "imem_pclk",
+ .pclk = "mem_iface_clk",
},
};
@@ -1954,8 +1954,8 @@
.clk = {
.name = {
/* note: 2d clocks disabled on v1 */
- .clk = "gfx2d0_clk",
- .pclk = "gfx2d0_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
#ifdef CONFIG_MSM_BUS_SCALING
.bus_scale_table = &grp2d0_bus_scale_pdata,
@@ -2008,8 +2008,8 @@
},
.clk = {
.name = {
- .clk = "gfx2d1_clk",
- .pclk = "gfx2d1_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
#ifdef CONFIG_MSM_BUS_SCALING
.bus_scale_table = &grp2d1_bus_scale_pdata,
diff --git a/arch/arm/mach-msm/devices-msm7x25.c b/arch/arm/mach-msm/devices-msm7x25.c
index 758230b..ca3caa2 100644
--- a/arch/arm/mach-msm/devices-msm7x25.c
+++ b/arch/arm/mach-msm/devices-msm7x25.c
@@ -934,7 +934,7 @@
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
- CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
+ CLK_LOOKUP("mem_clk", imem_clk.c, NULL),
CLK_LOOKUP("mdc_clk", mdc_clk.c, NULL),
CLK_LOOKUP("mddi_clk", pmdh_clk.c, NULL),
CLK_LOOKUP("mdp_clk", mdp_clk.c, NULL),
diff --git a/arch/arm/mach-msm/devices-msm7x27.c b/arch/arm/mach-msm/devices-msm7x27.c
index 63d3d8a..250cbad 100644
--- a/arch/arm/mach-msm/devices-msm7x27.c
+++ b/arch/arm/mach-msm/devices-msm7x27.c
@@ -844,12 +844,12 @@
},
.clk = {
.name = {
- .clk = "grp_clk",
- .pclk = "grp_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
},
.imem_clk_name = {
- .clk = "imem_clk",
+ .clk = "mem_clk",
},
};
diff --git a/arch/arm/mach-msm/devices-msm7x27a.c b/arch/arm/mach-msm/devices-msm7x27a.c
index a95dc97..4085040 100644
--- a/arch/arm/mach-msm/devices-msm7x27a.c
+++ b/arch/arm/mach-msm/devices-msm7x27a.c
@@ -595,12 +595,12 @@
},
.clk = {
.name = {
- .clk = "grp_clk",
- .pclk = "grp_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
},
.imem_clk_name = {
- .clk = "imem_clk",
+ .clk = "mem_clk",
.pclk = NULL,
},
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index a6c2a12..e1a3b4c 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -1111,12 +1111,12 @@
},
.clk = {
.name = {
- .clk = "grp_clk",
- .pclk = "grp_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
},
.imem_clk_name = {
- .clk = "imem_clk",
+ .clk = "mem_clk",
.pclk = NULL,
},
};
@@ -1163,8 +1163,8 @@
},
.clk = {
.name = {
- .clk = "grp_2d_clk",
- .pclk = "grp_2d_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
},
};
diff --git a/arch/arm/mach-msm/devices-msm8x60.c b/arch/arm/mach-msm/devices-msm8x60.c
index 1640ff3..5662f1c 100644
--- a/arch/arm/mach-msm/devices-msm8x60.c
+++ b/arch/arm/mach-msm/devices-msm8x60.c
@@ -681,8 +681,8 @@
},
.clk = {
.name = {
- .clk = "gfx3d_clk",
- .pclk = "gfx3d_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
#ifdef CONFIG_MSM_BUS_SCALING
.bus_scale_table = &grp3d_bus_scale_pdata,
@@ -690,7 +690,7 @@
},
.imem_clk_name = {
.clk = NULL,
- .pclk = "imem_pclk",
+ .pclk = "mem_iface_clk",
},
};
@@ -740,8 +740,8 @@
.clk = {
.name = {
/* note: 2d clocks disabled on v1 */
- .clk = "gfx2d0_clk",
- .pclk = "gfx2d0_pclk",
+ .clk = "core_clk",
+ .pclk = "iface_clk",
},
#ifdef CONFIG_MSM_BUS_SCALING
.bus_scale_table = &grp2d0_bus_scale_pdata,
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index 901e777..5ae5b8b 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -913,11 +913,11 @@
},
.clk = {
.name = {
- .clk = "grp_clk",
+ .clk = "core_clk",
},
},
.imem_clk_name = {
- .clk = "imem_clk",
+ .clk = "mem_clk",
},
};