Shift all setup stages one step earlier to better fit the
existing uclass.

Signed-off-by: Svyatoslav Ryhel <clamo...@gmail.com>
---
 drivers/video/endeavoru-panel.c | 128 +++++++++++++++++---------------
 1 file changed, 68 insertions(+), 60 deletions(-)

diff --git a/drivers/video/endeavoru-panel.c b/drivers/video/endeavoru-panel.c
index 79a272128b..1bff641434 100644
--- a/drivers/video/endeavoru-panel.c
+++ b/drivers/video/endeavoru-panel.c
@@ -57,61 +57,8 @@ static void dcs_write_one(struct mipi_dsi_device *dsi, u8 
cmd, u8 data)
 
 static int endeavoru_panel_enable_backlight(struct udevice *dev)
 {
-       struct endeavoru_panel_priv *priv = dev_get_priv(dev);
-       int ret;
-
-       ret = dm_gpio_set_value(&priv->reset_gpio, 1);
-       if (ret) {
-               log_err("error changing reset-gpios (%d)\n", ret);
-               return ret;
-       }
-       mdelay(5);
-
-       ret = regulator_set_enable_if_allowed(priv->vddio, 1);
-       if (ret) {
-               log_err("error enabling iovcc-supply (%d)\n", ret);
-               return ret;
-       }
-       mdelay(1);
-
-       ret = regulator_set_enable_if_allowed(priv->vdd, 1);
-       if (ret) {
-               log_err("error enabling vcc-supply (%d)\n", ret);
-               return ret;
-       }
-       mdelay(20);
-
-       ret = dm_gpio_set_value(&priv->reset_gpio, 0);
-       if (ret) {
-               log_err("error changing reset-gpios (%d)\n", ret);
-               return ret;
-       }
-       mdelay(2);
-
-       /* Reset panel */
-       ret = dm_gpio_set_value(&priv->reset_gpio, 1);
-       if (ret) {
-               log_err("error changing reset-gpios (%d)\n", ret);
-               return ret;
-       }
-       mdelay(1);
-
-       ret = dm_gpio_set_value(&priv->reset_gpio, 0);
-       if (ret) {
-               log_err("error changing reset-gpios (%d)\n", ret);
-               return ret;
-       }
-       mdelay(25);
-
-       return 0;
-}
-
-static int endeavoru_panel_set_backlight(struct udevice *dev, int percent)
-{
-       struct endeavoru_panel_priv *priv = dev_get_priv(dev);
        struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
        struct mipi_dsi_device *dsi = plat->device;
-       int ret;
 
        dcs_write_one(dsi, 0xc2, 0x08);
 
@@ -160,18 +107,22 @@ static int endeavoru_panel_set_backlight(struct udevice 
*dev, int percent)
        dcs_write_one(dsi, 0x55, 0x80);
        dcs_write_one(dsi, 0x5e, 0x06);
 
-       ret = backlight_enable(priv->backlight);
-       if (ret)
-               return ret;
-
        /* Set backlight */
        dcs_write_one(dsi, 0x51, 0x96);
 
-       ret = backlight_set_brightness(priv->backlight, percent);
+       return 0;
+}
+
+static int endeavoru_panel_set_backlight(struct udevice *dev, int percent)
+{
+       struct endeavoru_panel_priv *priv = dev_get_priv(dev);
+       int ret;
+
+       ret = backlight_enable(priv->backlight);
        if (ret)
                return ret;
 
-       return 0;
+       return backlight_set_brightness(priv->backlight, percent);
 }
 
 static int endeavoru_panel_timings(struct udevice *dev,
@@ -217,6 +168,63 @@ static int endeavoru_panel_of_to_plat(struct udevice *dev)
        return 0;
 }
 
+static int endeavoru_panel_hw_init(struct udevice *dev)
+{
+       struct endeavoru_panel_priv *priv = dev_get_priv(dev);
+       int ret;
+
+       ret = dm_gpio_set_value(&priv->reset_gpio, 1);
+       if (ret) {
+               log_debug("%s: error changing reset-gpios (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(5);
+
+       ret = regulator_set_enable_if_allowed(priv->vddio, 1);
+       if (ret) {
+               log_debug("%s: error enabling iovcc-supply (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(1);
+
+       ret = regulator_set_enable_if_allowed(priv->vdd, 1);
+       if (ret) {
+               log_debug("%s: error enabling vcc-supply (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(20);
+
+       ret = dm_gpio_set_value(&priv->reset_gpio, 0);
+       if (ret) {
+               log_debug("%s: error changing reset-gpios (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(2);
+
+       /* Reset panel */
+       ret = dm_gpio_set_value(&priv->reset_gpio, 1);
+       if (ret) {
+               log_debug("%s: error changing reset-gpios (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(1);
+
+       ret = dm_gpio_set_value(&priv->reset_gpio, 0);
+       if (ret) {
+               log_debug("%s: error changing reset-gpios (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(25);
+
+       return 0;
+}
+
 static int endeavoru_panel_probe(struct udevice *dev)
 {
        struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
@@ -226,7 +234,7 @@ static int endeavoru_panel_probe(struct udevice *dev)
        plat->format = MIPI_DSI_FMT_RGB888;
        plat->mode_flags = MIPI_DSI_MODE_VIDEO;
 
-       return 0;
+       return endeavoru_panel_hw_init(dev);
 }
 
 static const struct panel_ops endeavoru_panel_ops = {
-- 
2.40.1

Reply via email to