From e23c6c28b01785547e0356667ab435ef904af531 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 6 Mar 2016 19:27:48 -0700 Subject: [PATCH] video: Allow simple-panel to be used without regulators 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 Acked-by: Anatolij Gustschin --- drivers/video/simple_panel.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index c73f24295a..6219300097 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -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) -- 2.25.1