Commit fef604db authored by Maxime Ripard's avatar Maxime Ripard

drm/bridge: lt9611: Register and attach our DSI device at probe

In order to avoid any probe ordering issue, the best practice is to move
the secondary MIPI-DSI device registration and attachment to the
MIPI-DSI host at probe time. Let's do this.
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Tested-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025151536.1048186-9-maxime@cerno.tech
parent b91df118
...@@ -825,26 +825,7 @@ static int lt9611_bridge_attach(struct drm_bridge *bridge, ...@@ -825,26 +825,7 @@ static int lt9611_bridge_attach(struct drm_bridge *bridge,
return ret; return ret;
} }
/* Attach primary DSI */
lt9611->dsi0 = lt9611_attach_dsi(lt9611, lt9611->dsi0_node);
if (IS_ERR(lt9611->dsi0))
return PTR_ERR(lt9611->dsi0);
/* Attach secondary DSI, if specified */
if (lt9611->dsi1_node) {
lt9611->dsi1 = lt9611_attach_dsi(lt9611, lt9611->dsi1_node);
if (IS_ERR(lt9611->dsi1)) {
ret = PTR_ERR(lt9611->dsi1);
goto err_unregister_dsi0;
}
}
return 0; return 0;
err_unregister_dsi0:
drm_connector_cleanup(&lt9611->connector);
return ret;
} }
static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge, static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge,
...@@ -1165,10 +1146,29 @@ static int lt9611_probe(struct i2c_client *client, ...@@ -1165,10 +1146,29 @@ static int lt9611_probe(struct i2c_client *client,
drm_bridge_add(&lt9611->bridge); drm_bridge_add(&lt9611->bridge);
/* Attach primary DSI */
lt9611->dsi0 = lt9611_attach_dsi(lt9611, lt9611->dsi0_node);
if (IS_ERR(lt9611->dsi0)) {
ret = PTR_ERR(lt9611->dsi0);
goto err_remove_bridge;
}
/* Attach secondary DSI, if specified */
if (lt9611->dsi1_node) {
lt9611->dsi1 = lt9611_attach_dsi(lt9611, lt9611->dsi1_node);
if (IS_ERR(lt9611->dsi1)) {
ret = PTR_ERR(lt9611->dsi1);
goto err_remove_bridge;
}
}
lt9611_enable_hpd_interrupts(lt9611); lt9611_enable_hpd_interrupts(lt9611);
return lt9611_audio_init(dev, lt9611); return lt9611_audio_init(dev, lt9611);
err_remove_bridge:
drm_bridge_remove(&lt9611->bridge);
err_disable_regulators: err_disable_regulators:
regulator_bulk_disable(ARRAY_SIZE(lt9611->supplies), lt9611->supplies); regulator_bulk_disable(ARRAY_SIZE(lt9611->supplies), lt9611->supplies);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment