diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-23 09:04:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-23 09:04:40 -0400 |
| commit | c51f2ea72658a9b5514780b9cf719180d7cdd2cc (patch) | |
| tree | 03b4d2e691b839c9d0b1b67a4916c5b2a8c9a82b | |
| parent | 0339e81be1784d92d7df94bb332850422b246132 (diff) | |
| parent | 846dcae7337e25d1608c891fb68ce4227bc6b710 (diff) | |
| download | u-boot-c51f2ea72658a9b5514780b9cf719180d7cdd2cc.zip u-boot-c51f2ea72658a9b5514780b9cf719180d7cdd2cc.tar.gz u-boot-c51f2ea72658a9b5514780b9cf719180d7cdd2cc.tar.bz2 | |
Merge tag 'video-20231022' of https://source.denx.de/u-boot/custodians/u-boot-video
- updates for pwm_backlight, simple_panel and tegra20 to keep
fixed/gpio regulator counter in balance
| -rw-r--r-- | drivers/video/pwm_backlight.c | 13 | ||||
| -rw-r--r-- | drivers/video/simple_panel.c | 10 | ||||
| -rw-r--r-- | drivers/video/tegra20/tegra-dsi.c | 8 |
3 files changed, 14 insertions, 17 deletions
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index aa0e292..1c747d9 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -100,8 +100,8 @@ static int enable_sequence(struct udevice *dev, int seq) plat = dev_get_uclass_plat(priv->reg); log_debug("Enable '%s', regulator '%s'/'%s'\n", dev->name, priv->reg->name, plat->name); - ret = regulator_set_enable(priv->reg, true); - if (ret) { + ret = regulator_set_enable_if_allowed(priv->reg, true); + if (ret && ret != -ENOSYS) { log_debug("Cannot enable regulator for PWM '%s'\n", dev->name); return log_ret(ret); @@ -181,11 +181,10 @@ static int pwm_backlight_set_brightness(struct udevice *dev, int percent) } if (disable) { dm_gpio_set_value(&priv->enable, 0); - if (priv->reg) { - ret = regulator_set_enable(priv->reg, false); - if (ret) - return log_ret(ret); - } + ret = regulator_set_enable_if_allowed(priv->reg, false); + if (ret && ret != -ENOSYS) + return log_ret(ret); + priv->enabled = false; } diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index 6a6473e..efb122b 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -114,11 +114,11 @@ static int simple_panel_probe(struct udevice *dev) const u32 dsi_data = dev_get_driver_data(dev); int ret; - if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) { - debug("%s: Enable regulator '%s'\n", __func__, priv->reg->name); - ret = regulator_set_enable(priv->reg, true); - if (ret) - return ret; + ret = regulator_set_enable_if_allowed(priv->reg, true); + if (ret && ret != -ENOSYS) { + debug("%s: failed to enable regulator '%s' %d\n", + __func__, priv->reg->name, ret); + return ret; } switch (dsi_data) { diff --git a/drivers/video/tegra20/tegra-dsi.c b/drivers/video/tegra20/tegra-dsi.c index 8c3404e..b4cf4fa 100644 --- a/drivers/video/tegra20/tegra-dsi.c +++ b/drivers/video/tegra20/tegra-dsi.c @@ -831,11 +831,9 @@ static int tegra_dsi_bridge_probe(struct udevice *dev) tegra_dsi_get_format(device->format, &priv->format); - if (priv->avdd) { - ret = regulator_set_enable(priv->avdd, true); - if (ret) - return ret; - } + ret = regulator_set_enable_if_allowed(priv->avdd, true); + if (ret && ret != -ENOSYS) + return ret; tegra_dsi_init_clocks(dev); |