OMAPDSS: remove DT hacks for regulators

For booting Panda and 4430SDP with DT, while DSS did not support DT, we
had to had small hacks in the omapdss driver to get the regulators. With
DT now supported in DSS, we can remove those hacks.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index f3e4e468b49aadb1d098989031d7c95af7c755eb..121d1049d0bc3d6a7cc383e0dcd9fc0e39e490bb 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1160,18 +1160,11 @@ static int dsi_regulator_init(struct platform_device *dsidev)
        if (dsi->vdds_dsi_reg != NULL)
                return 0;
 
-       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))
-               vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "VCXIO");
+       vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "vdd");
 
        if (IS_ERR(vdds_dsi)) {
                if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
-                       DSSERR("can't get VDDS_DSI regulator\n");
+                       DSSERR("can't get DSI VDD regulator\n");
                return PTR_ERR(vdds_dsi);
        }
 

diff --git a/drivers/video/omap2/dss/hdmi4.c b/drivers/video/omap2/dss/hdmi4.c
index e9c3d9e6d450a71dff157320ee4550d07a1022f3..f5f7944a1fd1d6521624e8d4a5f62971bac916ed 100644 (file)
--- a/drivers/video/omap2/dss/hdmi4.c
+++ b/drivers/video/omap2/dss/hdmi4.c
@@ -88,18 +88,11 @@ static int hdmi_init_regulator(void)
        if (hdmi.vdda_hdmi_dac_reg != NULL)
                return 0;
 
-       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))
-               reg = devm_regulator_get(&hdmi.pdev->dev, "VDAC");
+       reg = devm_regulator_get(&hdmi.pdev->dev, "vdda");
 
        if (IS_ERR(reg)) {
                if (PTR_ERR(reg) != -EPROBE_DEFER)
-                       DSSERR("can't get VDDA_HDMI_DAC regulator\n");
+                       DSSERR("can't get VDDA regulator\n");
                return PTR_ERR(reg);
        }