Revert "drm/bridge: lt8912b: Register and attach our DSI device at probe"

This reverts commit ef4a40953c8076626875ff91c41e210fcee7a6fd which is
commit d89078c37b10f05fa4f4791b71db2572db361b68 upstream.

The commit was applied to make further commits apply cleanly, but the
commit depends on other commits in the same patchset. I.e. the
controlling DSI host would need a change too. Thus one would need to
backport the full patchset changing the DSI hosts and all downstream
DSI device drivers.

Revert the commit and fix up the conflicts with the backported fixes
to the lt8912b driver.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c
index 6891863ed5104aac3b60ca78a96364a5c13cd5bf..e16b0fc0cda0f6e4248abd8f5ef0be7891e1d6a3 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt8912b.c
+++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c
@@ -571,6 +571,10 @@ static int lt8912_bridge_attach(struct drm_bridge *bridge,
        if (ret)
                goto error;
 
+       ret = lt8912_attach_dsi(lt);
+       if (ret)
+               goto error;
+
        return 0;
 
 error:
@@ -726,15 +730,8 @@ static int lt8912_probe(struct i2c_client *client,
 
        drm_bridge_add(&lt->bridge);
 
-       ret = lt8912_attach_dsi(lt);
-       if (ret)
-               goto err_attach;
-
        return 0;
 
-err_attach:
-       drm_bridge_remove(&lt->bridge);
-       lt8912_free_i2c(lt);
 err_i2c:
        lt8912_put_dt(lt);
 err_dt_parse: