[U-Boot] [PATCH] video: meson: hdmi-supply regulator should be optional

Some boards don't have such a regulator, and don't need one to enable HDMI display. Make it optional, fixing hdmi display for those boards.
Also surround the regulator code with a config check on DM_REGULATOR.
Reported-by: Mohammad Rasim mohammad.rasim96@gmail.com Signed-off-by: Maxime Jourdan mjourdan@baylibre.com --- drivers/video/meson/meson_dw_hdmi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c index 7a1c060856..483c93f6b6 100644 --- a/drivers/video/meson/meson_dw_hdmi.c +++ b/drivers/video/meson/meson_dw_hdmi.c @@ -361,13 +361,19 @@ static int meson_dw_hdmi_probe(struct udevice *dev) priv->hdmi.i2c_clk_high = 0x67; priv->hdmi.i2c_clk_low = 0x78;
+#if CONFIG_IS_ENABLED(DM_REGULATOR) ret = device_get_supply_regulator(dev, "hdmi-supply", &supply); - if (ret) + if (ret && ret != -ENOENT) { + pr_err("Failed to get HDMI regulator\n"); return ret; + }
- ret = regulator_set_enable(supply, true); - if (ret) - return ret; + if (!ret) { + ret = regulator_set_enable(supply, true); + if (ret) + return ret; + } +#endif
ret = reset_get_bulk(dev, &resets); if (ret)

On 04/06/2019 22:26, Maxime Jourdan wrote:
Some boards don't have such a regulator, and don't need one to enable HDMI display. Make it optional, fixing hdmi display for those boards.
Also surround the regulator code with a config check on DM_REGULATOR.
Reported-by: Mohammad Rasim mohammad.rasim96@gmail.com Signed-off-by: Maxime Jourdan mjourdan@baylibre.com
drivers/video/meson/meson_dw_hdmi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c index 7a1c060856..483c93f6b6 100644 --- a/drivers/video/meson/meson_dw_hdmi.c +++ b/drivers/video/meson/meson_dw_hdmi.c @@ -361,13 +361,19 @@ static int meson_dw_hdmi_probe(struct udevice *dev) priv->hdmi.i2c_clk_high = 0x67; priv->hdmi.i2c_clk_low = 0x78;
+#if CONFIG_IS_ENABLED(DM_REGULATOR) ret = device_get_supply_regulator(dev, "hdmi-supply", &supply);
- if (ret)
- if (ret && ret != -ENOENT) {
return ret;pr_err("Failed to get HDMI regulator\n");
- }
- ret = regulator_set_enable(supply, true);
- if (ret)
return ret;
- if (!ret) {
ret = regulator_set_enable(supply, true);
if (ret)
return ret;
- }
+#endif
ret = reset_get_bulk(dev, &resets); if (ret)
Good catch !
Reviewed-by: Neil Armstrong narmstrong@baylibre.com

On 19/06/04 10:26PM, Maxime Jourdan wrote:
Some boards don't have such a regulator, and don't need one to enable HDMI display. Make it optional, fixing hdmi display for those boards.
Also surround the regulator code with a config check on DM_REGULATOR.
Reported-by: Mohammad Rasim mohammad.rasim96@gmail.com Signed-off-by: Maxime Jourdan mjourdan@baylibre.com
drivers/video/meson/meson_dw_hdmi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c index 7a1c060856..483c93f6b6 100644 --- a/drivers/video/meson/meson_dw_hdmi.c +++ b/drivers/video/meson/meson_dw_hdmi.c @@ -361,13 +361,19 @@ static int meson_dw_hdmi_probe(struct udevice *dev) priv->hdmi.i2c_clk_high = 0x67; priv->hdmi.i2c_clk_low = 0x78;
+#if CONFIG_IS_ENABLED(DM_REGULATOR) ret = device_get_supply_regulator(dev, "hdmi-supply", &supply);
- if (ret)
- if (ret && ret != -ENOENT) {
return ret;pr_err("Failed to get HDMI regulator\n");
- }
- ret = regulator_set_enable(supply, true);
- if (ret)
return ret;
- if (!ret) {
ret = regulator_set_enable(supply, true);
if (ret)
return ret;
- }
+#endif
ret = reset_get_bulk(dev, &resets); if (ret) -- 2.21.0
Tested-by: Mohammad Rasim mohammad.rasim96@gmail.com
participants (4)
-
Anatolij Gustschin
-
Maxime Jourdan
-
Mohammad Rasim
-
Neil Armstrong