msm: hdmi: Register device with clock driver and rename clocks
Rename the clocks per the new naming convention under which
similarly named clocks are distinguished between using their
associated device's name and ID.
Change-Id: I35f164e902003b1c3cd7243bc08d00b4c5d37b0c
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 5266ef6..af313c0 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4927,7 +4927,7 @@
CLK_DUMMY("vcodec_clk", VCODEC_CLK, NULL, OFF),
CLK_DUMMY("mdp_tv_clk", MDP_TV_CLK, NULL, OFF),
CLK_DUMMY("hdmi_clk", HDMI_TV_CLK, NULL, OFF),
- CLK_DUMMY("hdmi_app_clk", HDMI_APP_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", HDMI_APP_CLK, NULL, OFF),
CLK_DUMMY("vpe_clk", VPE_CLK, NULL, OFF),
CLK_DUMMY("vfe_clk", VFE_CLK, NULL, OFF),
CLK_DUMMY("csi_vfe_clk", CSI0_VFE_CLK, NULL, OFF),
@@ -4946,8 +4946,8 @@
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("gfx3d_pclk", 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("master_iface_clk", HDMI_M_P_CLK, NULL, OFF),
+ CLK_DUMMY("slave_iface_clk", 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),
@@ -5154,7 +5154,7 @@
CLK_LOOKUP("core_clk", vcodec_clk.c, "footswitch-8x60.7"),
CLK_LOOKUP("mdp_tv_clk", mdp_tv_clk.c, NULL),
CLK_LOOKUP("hdmi_clk", hdmi_tv_clk.c, NULL),
- CLK_LOOKUP("hdmi_app_clk", hdmi_app_clk.c, NULL),
+ CLK_LOOKUP("core_clk", hdmi_app_clk.c, "hdmi_msm.1"),
CLK_LOOKUP("vpe_clk", vpe_clk.c, NULL),
CLK_LOOKUP("core_clk", vpe_clk.c, "footswitch-8x60.9"),
CLK_LOOKUP("vfe_clk", vfe_clk.c, NULL),
@@ -5179,8 +5179,8 @@
CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "footswitch-8x60.1"),
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("master_iface_clk", hdmi_m_p_clk.c, "hdmi_msm.1"),
+ CLK_LOOKUP("slave_iface_clk", hdmi_s_p_clk.c, "hdmi_msm.1"),
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),
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 185d70e..4ca366f 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3658,7 +3658,7 @@
CLK_LOOKUP("mdp_tv_clk", mdp_tv_clk.c, NULL),
CLK_LOOKUP("hdmi_clk", hdmi_tv_clk.c, NULL),
CLK_LOOKUP("tv_src_clk", tv_src_clk.c, NULL),
- CLK_LOOKUP("hdmi_app_clk", hdmi_app_clk.c, NULL),
+ CLK_LOOKUP("core_clk", hdmi_app_clk.c, "hdmi_msm.1"),
CLK_LOOKUP("vpe_clk", vpe_clk.c, NULL),
CLK_LOOKUP("core_clk", vpe_clk.c, "footswitch-8x60.9"),
CLK_LOOKUP("csi_vfe_clk", csi0_vfe_clk.c, NULL),
@@ -3687,8 +3687,8 @@
CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "footswitch-8x60.1"),
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("master_iface_clk", hdmi_m_p_clk.c, "hdmi_msm.1"),
+ CLK_LOOKUP("slave_iface_clk", hdmi_s_p_clk.c, "hdmi_msm.1"),
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),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index ce01c7f..02b7569 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -670,7 +670,7 @@
CLK_DUMMY("rgb_tv_clk", RGB_TV_CLK, NULL, OFF),
CLK_DUMMY("npl_tv_clk", NPL_TV_CLK, NULL, OFF),
CLK_DUMMY("hdmi_clk", HDMI_TV_CLK, NULL, OFF),
- CLK_DUMMY("hdmi_app_clk", HDMI_APP_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", HDMI_APP_CLK, "hdmi_msm.1", OFF),
CLK_DUMMY("vpe_clk", VPE_CLK, NULL, OFF),
CLK_DUMMY("vfe_clk", VFE_CLK, NULL, OFF),
CLK_DUMMY("csi_vfe_clk", CSI0_VFE_CLK, NULL, OFF),
@@ -696,8 +696,8 @@
CLK_DUMMY("dsi2_pixel_clk", DSI2_PIXEL_CLK, NULL, OFF),
CLK_DUMMY("lvds_ref_clk", LVDS_REF_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("master_iface_clk", HDMI_M_P_CLK, "hdmi_msm.1", OFF),
+ CLK_DUMMY("slave_iface_clk", HDMI_S_P_CLK, "hdmi_msm.1", OFF),
CLK_DUMMY("ijpeg_pclk", IJPEG_P_CLK, NULL, OFF),
CLK_DUMMY("jpegd_pclk", JPEGD_P_CLK, NULL, OFF),
CLK_DUMMY("mem_iface_clk", IMEM_P_CLK, NULL, OFF),
diff --git a/drivers/video/msm/hdmi_msm.c b/drivers/video/msm/hdmi_msm.c
index 7da9159..b9d8171 100644
--- a/drivers/video/msm/hdmi_msm.c
+++ b/drivers/video/msm/hdmi_msm.c
@@ -3416,23 +3416,23 @@
return 0;
}
- hdmi_msm_state->hdmi_app_clk = clk_get(NULL, "hdmi_app_clk");
+ hdmi_msm_state->hdmi_app_clk = clk_get(&pdev->dev, "core_clk");
if (IS_ERR(hdmi_msm_state->hdmi_app_clk)) {
- DEV_ERR("'hdmi_app_clk' clk not found\n");
+ DEV_ERR("'core_clk' clk not found\n");
rc = IS_ERR(hdmi_msm_state->hdmi_app_clk);
goto error;
}
- hdmi_msm_state->hdmi_m_pclk = clk_get(NULL, "hdmi_m_pclk");
+ hdmi_msm_state->hdmi_m_pclk = clk_get(&pdev->dev, "master_iface_clk");
if (IS_ERR(hdmi_msm_state->hdmi_m_pclk)) {
- DEV_ERR("'hdmi_m_pclk' clk not found\n");
+ DEV_ERR("'master_iface_clk' clk not found\n");
rc = IS_ERR(hdmi_msm_state->hdmi_m_pclk);
goto error;
}
- hdmi_msm_state->hdmi_s_pclk = clk_get(NULL, "hdmi_s_pclk");
+ hdmi_msm_state->hdmi_s_pclk = clk_get(&pdev->dev, "slave_iface_clk");
if (IS_ERR(hdmi_msm_state->hdmi_s_pclk)) {
- DEV_ERR("'hdmi_s_pclk' clk not found\n");
+ DEV_ERR("'slave_iface_clk' clk not found\n");
rc = IS_ERR(hdmi_msm_state->hdmi_s_pclk);
goto error;
}