Skip to content

Commit

Permalink
drm/msm/mdp5: drop vdd regulator
Browse files Browse the repository at this point in the history
The "vdd" regulator was used by the mdp5 driver only on downstream
kernels, where the GDSC is represented as a regulator. On all current
kernels the MDSS_GDSC is implemented as the power domain, removing the
need for this regulator. Remove it from the mdp5 driver.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211104003428.2205497-1-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
  • Loading branch information
Dmitry Baryshkov authored and Rob Clark committed Nov 28, 2021
1 parent 016aa55 commit 4cef29b
Showing 1 changed file with 2 additions and 22 deletions.
24 changes: 2 additions & 22 deletions drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ struct mdp5_mdss {

void __iomem *mmio, *vbif;

struct regulator *vdd;

struct clk *ahb_clk;
struct clk *axi_clk;
struct clk *vsync_clk;
Expand Down Expand Up @@ -185,8 +183,6 @@ static void mdp5_mdss_destroy(struct drm_device *dev)
irq_domain_remove(mdp5_mdss->irqcontroller.domain);
mdp5_mdss->irqcontroller.domain = NULL;

regulator_disable(mdp5_mdss->vdd);

pm_runtime_disable(dev->dev);
}

Expand Down Expand Up @@ -234,31 +230,17 @@ int mdp5_mdss_init(struct drm_device *dev)
goto fail;
}

/* Regulator to enable GDSCs in downstream kernels */
mdp5_mdss->vdd = devm_regulator_get(dev->dev, "vdd");
if (IS_ERR(mdp5_mdss->vdd)) {
ret = PTR_ERR(mdp5_mdss->vdd);
goto fail;
}

ret = regulator_enable(mdp5_mdss->vdd);
if (ret) {
DRM_DEV_ERROR(dev->dev, "failed to enable regulator vdd: %d\n",
ret);
goto fail;
}

ret = devm_request_irq(dev->dev, platform_get_irq(pdev, 0),
mdss_irq, 0, "mdss_isr", mdp5_mdss);
if (ret) {
DRM_DEV_ERROR(dev->dev, "failed to init irq: %d\n", ret);
goto fail_irq;
goto fail;
}

ret = mdss_irq_domain_init(mdp5_mdss);
if (ret) {
DRM_DEV_ERROR(dev->dev, "failed to init sub-block irqs: %d\n", ret);
goto fail_irq;
goto fail;
}

mdp5_mdss->base.funcs = &mdss_funcs;
Expand All @@ -267,8 +249,6 @@ int mdp5_mdss_init(struct drm_device *dev)
pm_runtime_enable(dev->dev);

return 0;
fail_irq:
regulator_disable(mdp5_mdss->vdd);
fail:
return ret;
}

0 comments on commit 4cef29b

Please sign in to comment.