diff options
| author | Archit Taneja | 2018-01-17 10:34:42 +0100 |
|---|---|---|
| committer | Rob Clark | 2018-02-20 16:41:21 +0100 |
| commit | 29a1157ceba2bf885479d6dcd2933a6b0778266b (patch) | |
| tree | 19870c67d3acd62a2c0214c0e605c7038e569ef4 /drivers/gpu/drm/msm/dsi | |
| parent | drm/msm/dsi: Populate the 10nm PHY funcs (diff) | |
| download | kernel-qcow2-linux-29a1157ceba2bf885479d6dcd2933a6b0778266b.tar.gz kernel-qcow2-linux-29a1157ceba2bf885479d6dcd2933a6b0778266b.tar.xz kernel-qcow2-linux-29a1157ceba2bf885479d6dcd2933a6b0778266b.zip | |
drm/msm/dsi: Use msm_clk_get in dsi_get_config
We try to get the interface clock in dsi_get_config early during DSI's
component bind. Try getting both the "iface" and "iface_clk" clock name
variants so that we are compatible with both new and legacy DT.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/dsi')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_host.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 0f7324a686ca..7611fe014036 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -214,7 +214,7 @@ static const struct msm_dsi_cfg_handler *dsi_get_config( goto exit; } - ahb_clk = clk_get(dev, "iface_clk"); + ahb_clk = msm_clk_get(msm_host->pdev, "iface"); if (IS_ERR(ahb_clk)) { pr_err("%s: cannot get interface clock\n", __func__); goto put_gdsc; @@ -225,7 +225,7 @@ static const struct msm_dsi_cfg_handler *dsi_get_config( ret = regulator_enable(gdsc_reg); if (ret) { pr_err("%s: unable to enable gdsc\n", __func__); - goto put_clk; + goto put_gdsc; } ret = clk_prepare_enable(ahb_clk); @@ -249,8 +249,6 @@ disable_clks: disable_gdsc: regulator_disable(gdsc_reg); pm_runtime_put_sync(dev); -put_clk: - clk_put(ahb_clk); put_gdsc: regulator_put(gdsc_reg); exit: |