Skip to content

Commit

Permalink
drm/bridge: ti-sn65dsi86: Move all the chip-related init to the start
Browse files Browse the repository at this point in the history
This is just code motion of the probe routine to move all the things
that are for the "whole chip" (instead of the GPIO parts or the
MIPI-to-eDP parts) together at the start of probe. This is in
preparation for breaking the driver into sub-drivers.

Since we're using devm for all of the "whole chip" stuff this is
actually quite easy now.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423095743.v5.8.Ide8ba40feb2e43bc98a11edbb08d696d62dcd83e@changeid
  • Loading branch information
Douglas Anderson committed May 3, 2021
1 parent f94eb8a commit bef236a
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/gpu/drm/bridge/ti-sn65dsi86.c
Original file line number Diff line number Diff line change
Expand Up @@ -1255,21 +1255,13 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,
return PTR_ERR(pdata->regmap);
}

ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &pdata->panel, NULL);
if (ret) {
DRM_ERROR("could not find any panel node\n");
return ret;
}

pdata->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
if (IS_ERR(pdata->enable_gpio)) {
DRM_ERROR("failed to get enable gpio from DT\n");
ret = PTR_ERR(pdata->enable_gpio);
return ret;
}

ti_sn_bridge_parse_lanes(pdata, dev->of_node);

ret = ti_sn65dsi86_parse_regulators(pdata);
if (ret) {
DRM_ERROR("failed to parse regulators\n");
Expand All @@ -1280,12 +1272,22 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,
if (IS_ERR(pdata->refclk))
return PTR_ERR(pdata->refclk);

ret = ti_sn_bridge_parse_dsi_host(pdata);
pm_runtime_enable(dev);
ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);
if (ret)
return ret;

pm_runtime_enable(dev);
ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);
ti_sn65dsi86_debugfs_init(pdata);

ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &pdata->panel, NULL);
if (ret) {
DRM_ERROR("could not find any panel node\n");
return ret;
}

ti_sn_bridge_parse_lanes(pdata, dev->of_node);

ret = ti_sn_bridge_parse_dsi_host(pdata);
if (ret)
return ret;

Expand All @@ -1303,8 +1305,6 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,

drm_bridge_add(&pdata->bridge);

ti_sn65dsi86_debugfs_init(pdata);

return 0;
}

Expand Down

0 comments on commit bef236a

Please sign in to comment.