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

This reverts commit 29aba28ea195182f547cd8dac1b80eed51b6b73d.

This and the dependent fixes broke display on RB5.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index 1e33b3150bdc54e95ca0a5c857fac2cd13e25451..b58842f69fff1b183a6d30fd139d6256ea5e44a3 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
@@ -367,6 +367,18 @@ static int lt9611uxc_bridge_attach(struct drm_bridge *bridge,
                        return ret;
        }
 
+       /* Attach primary DSI */
+       lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
+       if (IS_ERR(lt9611uxc->dsi0))
+               return PTR_ERR(lt9611uxc->dsi0);
+
+       /* Attach secondary DSI, if specified */
+       if (lt9611uxc->dsi1_node) {
+               lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
+               if (IS_ERR(lt9611uxc->dsi1))
+                       return PTR_ERR(lt9611uxc->dsi1);
+       }
+
        return 0;
 }
 
@@ -946,27 +958,8 @@ retry:
 
        drm_bridge_add(&lt9611uxc->bridge);
 
-       /* Attach primary DSI */
-       lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
-       if (IS_ERR(lt9611uxc->dsi0)) {
-               ret = PTR_ERR(lt9611uxc->dsi0);
-               goto err_remove_bridge;
-       }
-
-       /* Attach secondary DSI, if specified */
-       if (lt9611uxc->dsi1_node) {
-               lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
-               if (IS_ERR(lt9611uxc->dsi1)) {
-                       ret = PTR_ERR(lt9611uxc->dsi1);
-                       goto err_remove_bridge;
-               }
-       }
-
        return lt9611uxc_audio_init(dev, lt9611uxc);
 
-err_remove_bridge:
-       drm_bridge_remove(&lt9611uxc->bridge);
-
 err_disable_regulators:
        regulator_bulk_disable(ARRAY_SIZE(lt9611uxc->supplies), lt9611uxc->supplies);