diff options
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 5 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/hdmi4.c | 5 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index a820c37e323..782e8989fcf 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -1151,7 +1151,10 @@ static int dsi_regulator_init(struct platform_device *dsidev) if (dsi->vdds_dsi_reg != NULL) return 0; - vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "vdds_dsi"); + if (dsi->pdev->dev.of_node) + vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "vdd"); + else + vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "vdds_dsi"); /* DT HACK: try VCXIO to make omapdss work for o4 sdp/panda */ if (IS_ERR(vdds_dsi)) diff --git a/drivers/video/omap2/dss/hdmi4.c b/drivers/video/omap2/dss/hdmi4.c index 4a74538f9ea..ba6f02518eb 100644 --- a/drivers/video/omap2/dss/hdmi4.c +++ b/drivers/video/omap2/dss/hdmi4.c @@ -88,7 +88,10 @@ static int hdmi_init_regulator(void) if (hdmi.vdda_hdmi_dac_reg != NULL) return 0; - reg = devm_regulator_get(&hdmi.pdev->dev, "vdda_hdmi_dac"); + if (hdmi.pdev->dev.of_node) + reg = devm_regulator_get(&hdmi.pdev->dev, "vdda"); + else + reg = devm_regulator_get(&hdmi.pdev->dev, "vdda_hdmi_dac"); /* DT HACK: try VDAC to make omapdss work for o4 sdp/panda */ if (IS_ERR(reg)) diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 2cd7f7e4210..7d40e52ad6d 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -636,7 +636,10 @@ static int venc_init_regulator(void) if (venc.vdda_dac_reg != NULL) return 0; - vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac"); + if (venc.pdev->dev.of_node) + vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda"); + else + vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac"); if (IS_ERR(vdda_dac)) { if (PTR_ERR(vdda_dac) != -EPROBE_DEFER) |