diff options
| author | Tom Rini <[email protected]> | 2023-04-08 14:19:08 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-04-08 14:19:08 -0400 |
| commit | fa6f458c679f55edd11e8e34f209d4a0e01bf7bc (patch) | |
| tree | 6c6862df3c961794ed864319b85dc493acc0f3ee /drivers/video | |
| parent | 187c7aba221f633dffa2f33bd582147059ed24f3 (diff) | |
| parent | e3fed5ce790730dd3e05c810de8ee483af3fe42a (diff) | |
Merge branch 'master_regulator/fixes' of https://source.denx.de/u-boot/custodians/u-boot-sh
- Fix usage of CONFIG_IS_ENABLED and DM_REGULATOR
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/orisetech_otm8009a.c | 4 | ||||
| -rw-r--r-- | drivers/video/raydium-rm68200.c | 4 | ||||
| -rw-r--r-- | drivers/video/simple_panel.c | 4 | ||||
| -rw-r--r-- | drivers/video/tdo-tl070wsh30.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c index 95738e34bf6..848f174b6e4 100644 --- a/drivers/video/orisetech_otm8009a.c +++ b/drivers/video/orisetech_otm8009a.c @@ -300,7 +300,7 @@ static int otm8009a_panel_of_to_plat(struct udevice *dev) struct otm8009a_panel_priv *priv = dev_get_priv(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR)) { + if (CONFIG_IS_ENABLED(DM_REGULATOR)) { ret = device_get_supply_regulator(dev, "power-supply", &priv->reg); if (ret && ret != -ENOENT) { @@ -326,7 +326,7 @@ static int otm8009a_panel_probe(struct udevice *dev) struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) { + if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) { dev_dbg(dev, "enable regulator '%s'\n", priv->reg->name); ret = regulator_set_enable(priv->reg, true); if (ret) diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c index 373668d28bf..f1fce55a2cb 100644 --- a/drivers/video/raydium-rm68200.c +++ b/drivers/video/raydium-rm68200.c @@ -266,7 +266,7 @@ static int rm68200_panel_of_to_plat(struct udevice *dev) struct rm68200_panel_priv *priv = dev_get_priv(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR)) { + if (CONFIG_IS_ENABLED(DM_REGULATOR)) { ret = device_get_supply_regulator(dev, "power-supply", &priv->reg); if (ret && ret != -ENOENT) { @@ -299,7 +299,7 @@ static int rm68200_panel_probe(struct udevice *dev) struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) { + if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) { ret = regulator_set_enable(priv->reg, true); if (ret) return ret; diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index 81fcafb9f58..6a6473eb0e5 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -76,7 +76,7 @@ static int simple_panel_of_to_plat(struct udevice *dev) struct simple_panel_priv *priv = dev_get_priv(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR)) { + if (CONFIG_IS_ENABLED(DM_REGULATOR)) { ret = uclass_get_device_by_phandle(UCLASS_REGULATOR, dev, "power-supply", &priv->reg); if (ret) { @@ -114,7 +114,7 @@ static int simple_panel_probe(struct udevice *dev) const u32 dsi_data = dev_get_driver_data(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) { + 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) diff --git a/drivers/video/tdo-tl070wsh30.c b/drivers/video/tdo-tl070wsh30.c index 7ad0af73f05..273672db024 100644 --- a/drivers/video/tdo-tl070wsh30.c +++ b/drivers/video/tdo-tl070wsh30.c @@ -75,7 +75,7 @@ static int tl070wsh30_panel_of_to_plat(struct udevice *dev) struct tl070wsh30_panel_priv *priv = dev_get_priv(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR)) { + if (CONFIG_IS_ENABLED(DM_REGULATOR)) { ret = device_get_supply_regulator(dev, "power-supply", &priv->reg); if (ret && ret != -ENOENT) { @@ -108,7 +108,7 @@ static int tl070wsh30_panel_probe(struct udevice *dev) struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); int ret; - if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) { + if (CONFIG_IS_ENABLED(DM_REGULATOR) && priv->reg) { ret = regulator_set_enable(priv->reg, true); if (ret) return ret; |