Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a1157c authored by Archit Taneja's avatar Archit Taneja Committed by Rob Clark
Browse files

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: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent ff73ff19

drivers/gpu/drm/msm/dsi/dsi_host.c

+2 −4
Original line number Diff line number Diff line
@@ -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 @@ static const struct msm_dsi_cfg_handler *dsi_get_config( 
disable_gdsc:

	regulator_disable(gdsc_reg);

	pm_runtime_put_sync(dev);

put_clk:

	clk_put(ahb_clk);

put_gdsc:

	regulator_put(gdsc_reg);

exit: