evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/tegra: hdmi - Reverse regulator enable ordering

Browse source 
Schematics indicate that the AVDD_HDMI_PLL supply should be enabled
prior to the AVDD_HDMI supply.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2014-04-16 10:24:12 +02:00
parent 80b9213913
commit 8868568718
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/gpu/drm/tegra/hdmi.c
View file

@ -43,8 +43,8 @@ struct tegra_hdmi {
bool enabled; bool enabled;
struct regulator *hdmi; struct regulator *hdmi;
struct regulator *vdd;
struct regulator *pll; struct regulator *pll;
struct regulator *vdd;
void __iomem *regs; void __iomem *regs;
unsigned int irq; unsigned int irq;
@ -711,18 +711,18 @@ static int tegra_output_hdmi_enable(struct tegra_output *output)
h_back_porch = mode->htotal - mode->hsync_end; h_back_porch = mode->htotal - mode->hsync_end;
h_front_porch = mode->hsync_start - mode->hdisplay; h_front_porch = mode->hsync_start - mode->hdisplay;
err = regulator_enable(hdmi->vdd);
if (err < 0) {
dev_err(hdmi->dev, "failed to enable VDD regulator: %d\n", err);
return err;
}
err = regulator_enable(hdmi->pll); err = regulator_enable(hdmi->pll);
if (err < 0) { if (err < 0) {
dev_err(hdmi->dev, "failed to enable PLL regulator: %d\n", err); dev_err(hdmi->dev, "failed to enable PLL regulator: %d\n", err);
return err; return err;
} }
err = regulator_enable(hdmi->vdd);
if (err < 0) {
dev_err(hdmi->dev, "failed to enable VDD regulator: %d\n", err);
return err;
}
err = clk_set_rate(hdmi->clk, pclk); err = clk_set_rate(hdmi->clk, pclk);
if (err < 0) if (err < 0)
return err; return err;
@ -946,8 +946,8 @@ static int tegra_output_hdmi_disable(struct tegra_output *output)
reset_control_assert(hdmi->rst); reset_control_assert(hdmi->rst);
clk_disable(hdmi->clk); clk_disable(hdmi->clk);
regulator_disable(hdmi->pll);
regulator_disable(hdmi->vdd); regulator_disable(hdmi->vdd);
regulator_disable(hdmi->pll);
hdmi->enabled = false; hdmi->enabled = false;
@ -1403,18 +1403,18 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
return PTR_ERR(hdmi->hdmi); return PTR_ERR(hdmi->hdmi);
} }
hdmi->vdd = devm_regulator_get(&pdev->dev, "vdd");
if (IS_ERR(hdmi->vdd)) {
dev_err(&pdev->dev, "failed to get VDD regulator\n");
return PTR_ERR(hdmi->vdd);
}
hdmi->pll = devm_regulator_get(&pdev->dev, "pll"); hdmi->pll = devm_regulator_get(&pdev->dev, "pll");
if (IS_ERR(hdmi->pll)) { if (IS_ERR(hdmi->pll)) {
dev_err(&pdev->dev, "failed to get PLL regulator\n"); dev_err(&pdev->dev, "failed to get PLL regulator\n");
return PTR_ERR(hdmi->pll); return PTR_ERR(hdmi->pll);
} }
hdmi->vdd = devm_regulator_get(&pdev->dev, "vdd");
if (IS_ERR(hdmi->vdd)) {
dev_err(&pdev->dev, "failed to get VDD regulator\n");
return PTR_ERR(hdmi->vdd);
}
hdmi->output.dev = &pdev->dev; hdmi->output.dev = &pdev->dev;
err = tegra_output_probe(&hdmi->output); err = tegra_output_probe(&hdmi->output);