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/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),