video: renesas: shift the init sequence by one step earlier

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

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/drivers/video/renesas-r61307.c b/drivers/video/renesas-r61307.c
index 426fdc6224a043065a188a86f2cd9f8b688692cb..1eccaf6b1beca4698d166c95c73e95af7acdef86 100644 (file)
--- a/drivers/video/renesas-r61307.c
+++ b/drivers/video/renesas-r61307.c
@@ -118,42 +118,6 @@ static struct display_timing default_timing = {
 };
 
 static int renesas_r61307_enable_backlight(struct udevice *dev)
-{
-       struct renesas_r61307_priv *priv = dev_get_priv(dev);
-       int ret;
-
-       ret = regulator_set_enable_if_allowed(priv->vcc, 1);
-       if (ret) {
-               log_err("enabling vcc-supply failed (%d)\n", ret);
-               return ret;
-       }
-       mdelay(5);
-
-       ret = regulator_set_enable_if_allowed(priv->iovcc, 1);
-       if (ret) {
-               log_err("enabling iovcc-supply failed (%d)\n", ret);
-               return ret;
-       }
-
-       ret = dm_gpio_set_value(&priv->reset_gpio, 0);
-       if (ret) {
-               log_err("changing reset-gpio failed (%d)\n", ret);
-               return ret;
-       }
-       mdelay(5);
-
-       ret = dm_gpio_set_value(&priv->reset_gpio, 1);
-       if (ret) {
-               log_err("changing reset-gpio failed (%d)\n", ret);
-               return ret;
-       }
-
-       mdelay(5);
-
-       return 0;
-}
-
-static int renesas_r61307_set_backlight(struct udevice *dev, int percent)
 {
        struct renesas_r61307_priv *priv = dev_get_priv(dev);
        struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
@@ -205,18 +169,23 @@ static int renesas_r61307_set_backlight(struct udevice *dev, int percent)
                log_err("failed to set display on: %d\n", ret);
                return ret;
        }
-
        mdelay(50);
 
+       return 0;
+}
+
+static int renesas_r61307_set_backlight(struct udevice *dev, int percent)
+{
+       struct renesas_r61307_priv *priv = dev_get_priv(dev);
+       int ret;
+
        ret = backlight_enable(priv->backlight);
        if (ret)
                return ret;
 
-       ret = backlight_set_brightness(priv->backlight, percent);
-       if (ret)
-               return ret;
+       mdelay(5);
 
-       return 0;
+       return backlight_set_brightness(priv->backlight, percent);
 }
 
 static int renesas_r61307_timings(struct udevice *dev,
@@ -266,6 +235,46 @@ static int renesas_r61307_of_to_plat(struct udevice *dev)
        return 0;
 }
 
+static int renesas_r61307_hw_init(struct udevice *dev)
+{
+       struct renesas_r61307_priv *priv = dev_get_priv(dev);
+       int ret;
+
+       ret = regulator_set_enable_if_allowed(priv->vcc, 1);
+       if (ret) {
+               log_debug("%s: enabling vcc-supply failed (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(5);
+
+       ret = regulator_set_enable_if_allowed(priv->iovcc, 1);
+       if (ret) {
+               log_debug("%s: enabling iovcc-supply failed (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+
+       ret = dm_gpio_set_value(&priv->reset_gpio, 0);
+       if (ret) {
+               log_debug("%s: changing reset-gpio failed (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(5);
+
+       ret = dm_gpio_set_value(&priv->reset_gpio, 1);
+       if (ret) {
+               log_debug("%s: changing reset-gpio failed (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+
+       mdelay(5);
+
+       return 0;
+}
+
 static int renesas_r61307_probe(struct udevice *dev)
 {
        struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
@@ -275,7 +284,7 @@ static int renesas_r61307_probe(struct udevice *dev)
        plat->format = MIPI_DSI_FMT_RGB888;
        plat->mode_flags = MIPI_DSI_MODE_VIDEO;
 
-       return 0;
+       return renesas_r61307_hw_init(dev);
 }
 
 static const struct panel_ops renesas_r61307_ops = {

diff --git a/drivers/video/renesas-r69328.c b/drivers/video/renesas-r69328.c
index d2f716946814022da5bd324d02805f799bf792a2..ecf89ec021b876687410151e9118b23a54ba6a62 100644 (file)
--- a/drivers/video/renesas-r69328.c
+++ b/drivers/video/renesas-r69328.c
@@ -65,37 +65,6 @@ static struct display_timing default_timing = {
 
 static int renesas_r69328_enable_backlight(struct udevice *dev)
 {
-       struct renesas_r69328_priv *priv = dev_get_priv(dev);
-       int ret;
-
-       ret = dm_gpio_set_value(&priv->enable_gpio, 1);
-       if (ret) {
-               log_err("error changing enable-gpios (%d)\n", ret);
-               return ret;
-       }
-       mdelay(5);
-
-       ret = dm_gpio_set_value(&priv->reset_gpio, 0);
-       if (ret) {
-               log_err("error changing reset-gpios (%d)\n", ret);
-               return ret;
-       }
-       mdelay(5);
-
-       ret = dm_gpio_set_value(&priv->reset_gpio, 1);
-       if (ret) {
-               log_err("error changing reset-gpios (%d)\n", ret);
-               return ret;
-       }
-
-       mdelay(5);
-
-       return 0;
-}
-
-static int renesas_r69328_set_backlight(struct udevice *dev, int percent)
-{
-       struct renesas_r69328_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;
@@ -153,18 +122,23 @@ static int renesas_r69328_set_backlight(struct udevice *dev, int percent)
                log_err("failed to set display on: %d\n", ret);
                return ret;
        }
-
        mdelay(50);
 
+       return 0;
+}
+
+static int renesas_r69328_set_backlight(struct udevice *dev, int percent)
+{
+       struct renesas_r69328_priv *priv = dev_get_priv(dev);
+       int ret;
+
        ret = backlight_enable(priv->backlight);
        if (ret)
                return ret;
 
-       ret = backlight_set_brightness(priv->backlight, percent);
-       if (ret)
-               return ret;
+       mdelay(5);
 
-       return 0;
+       return backlight_set_brightness(priv->backlight, percent);
 }
 
 static int renesas_r69328_timings(struct udevice *dev,
@@ -203,6 +177,39 @@ static int renesas_r69328_of_to_plat(struct udevice *dev)
        return 0;
 }
 
+static int renesas_r69328_hw_init(struct udevice *dev)
+{
+       struct renesas_r69328_priv *priv = dev_get_priv(dev);
+       int ret;
+
+       ret = dm_gpio_set_value(&priv->enable_gpio, 1);
+       if (ret) {
+               log_debug("%s: error changing enable-gpios (%d)\n",
+                         __func__, ret);
+               return ret;
+       }
+       mdelay(5);
+
+       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(5);
+
+       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);
+
+       return 0;
+}
+
 static int renesas_r69328_probe(struct udevice *dev)
 {
        struct mipi_dsi_panel_plat *plat = dev_get_plat(dev);
@@ -212,7 +219,7 @@ static int renesas_r69328_probe(struct udevice *dev)
        plat->format = MIPI_DSI_FMT_RGB888;
        plat->mode_flags = MIPI_DSI_MODE_VIDEO;
 
-       return 0;
+       return renesas_r69328_hw_init(dev);
 }
 
 static const struct panel_ops renesas_r69328_ops = {