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

drm/msm/mdp5: Drop clock names with "_clk" suffix 



We have upstream bindings (msm8916) that have the "_clk" suffix in the
clock names. The downstream bindings also require it.

We want to drop the "_clk" suffix and at the same time support existing
bindings. Update the MDP5 code with the the msm_clk_get() helper to
support both old and new clock names.

Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent b0e77fd8

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c

+6 −6
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int get_clk(struct platform_device *pdev, struct clk **clkp, 
		const char *name, bool mandatory)

{

	struct device *dev = &pdev->dev;

	struct clk *clk = devm_clk_get(dev, name);

	struct clk *clk = msm_clk_get(pdev, name);

	if (IS_ERR(clk) && mandatory) {

		dev_err(dev, "failed to get %s (%ld)\n", name, PTR_ERR(clk));

		return PTR_ERR(clk);
@@ -887,21 +887,21 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev) 
	}



	/* mandatory clocks: */

	ret = get_clk(pdev, &mdp5_kms->axi_clk, "bus_clk", true);

	ret = get_clk(pdev, &mdp5_kms->axi_clk, "bus", true);

	if (ret)

		goto fail;

	ret = get_clk(pdev, &mdp5_kms->ahb_clk, "iface_clk", true);

	ret = get_clk(pdev, &mdp5_kms->ahb_clk, "iface", true);

	if (ret)

		goto fail;

	ret = get_clk(pdev, &mdp5_kms->core_clk, "core_clk", true);

	ret = get_clk(pdev, &mdp5_kms->core_clk, "core", true);

	if (ret)

		goto fail;

	ret = get_clk(pdev, &mdp5_kms->vsync_clk, "vsync_clk", true);

	ret = get_clk(pdev, &mdp5_kms->vsync_clk, "vsync", true);

	if (ret)

		goto fail;



	/* optional clocks: */

	get_clk(pdev, &mdp5_kms->lut_clk, "lut_clk", false);

	get_clk(pdev, &mdp5_kms->lut_clk, "lut", false);



	/* we need to set a default rate before enabling.  Set a safe

	 * rate first, then figure out hw revision, and then set a

CRA Git | Maintained and supported by SUSTech CRA and CCSE