video: Allow simple-panel to be used without regulators
authorSimon Glass <sjg@chromium.org>
Mon, 7 Mar 2016 02:27:48 +0000 (19:27 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Thu, 17 Mar 2016 02:27:22 +0000 (10:27 +0800)
At present simple-panel requires regulator support and will not build
without it. But some panels do not have a power supply, or at least not one
that can be controlled. Update the implementation to cope with this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
drivers/video/simple_panel.c

index c73f24295a4057893872321bc6a3fe617d9623ea..621930009707de1ceca28183c5d1e21f11f0d7a8 100644 (file)
@@ -38,13 +38,15 @@ static int simple_panel_ofdata_to_platdata(struct udevice *dev)
        struct simple_panel_priv *priv = dev_get_priv(dev);
        int ret;
 
-       ret = uclass_get_device_by_phandle(UCLASS_REGULATOR, dev,
-                                          "power-supply", &priv->reg);
-       if (ret) {
-               debug("%s: Warning: cnnot get power supply: ret=%d\n",
-                     __func__, ret);
-               if (ret != -ENOENT)
-                       return ret;
+       if (IS_ENABLED(CONFIG_DM_REGULATOR)) {
+               ret = uclass_get_device_by_phandle(UCLASS_REGULATOR, dev,
+                                                  "power-supply", &priv->reg);
+               if (ret) {
+                       debug("%s: Warning: cnnot get power supply: ret=%d\n",
+                             __func__, ret);
+                       if (ret != -ENOENT)
+                               return ret;
+               }
        }
        ret = uclass_get_device_by_phandle(UCLASS_PANEL_BACKLIGHT, dev,
                                           "backlight", &priv->backlight);
@@ -69,7 +71,7 @@ static int simple_panel_probe(struct udevice *dev)
        struct simple_panel_priv *priv = dev_get_priv(dev);
        int ret;
 
-       if (priv->reg) {
+       if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) {
                debug("%s: Enable regulator '%s'\n", __func__, priv->reg->name);
                ret = regulator_set_enable(priv->reg, true);
                if (ret)