lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 02/21] drm/bridge: adv7511: Register and attach our DSI device at probe
    Date
    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: Sam Ravnborg <sam@ravnborg.org>
    Tested-by: John Stultz <john.stultz@linaro.org>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    ---
    drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 13 ++++++++++---
    1 file changed, 10 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
    index 9e3585f23cf1..f8e5da148599 100644
    --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
    +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
    @@ -910,9 +910,6 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge,
    return ret;
    }

    - if (adv->type == ADV7533 || adv->type == ADV7535)
    - ret = adv7533_attach_dsi(adv);
    -
    if (adv->i2c_main->irq)
    regmap_write(adv->regmap, ADV7511_REG_INT_ENABLE(0),
    ADV7511_INT0_HPD);
    @@ -1288,8 +1285,18 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
    drm_bridge_add(&adv7511->bridge);

    adv7511_audio_init(dev, adv7511);
    +
    + if (adv7511->type == ADV7533 || adv7511->type == ADV7535) {
    + ret = adv7533_attach_dsi(adv7511);
    + if (ret)
    + goto err_unregister_audio;
    + }
    +
    return 0;

    +err_unregister_audio:
    + adv7511_audio_exit(adv7511);
    + drm_bridge_remove(&adv7511->bridge);
    err_unregister_cec:
    i2c_unregister_device(adv7511->i2c_cec);
    clk_disable_unprepare(adv7511->cec_clk);
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-10-25 17:16    [W:8.698 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site