Apply analogix_dp_finish_probe() in order to move the panel/bridge parsing from Exynos side to the Analogix side.
Signed-off-by: Damon Ding <damon.d...@rock-chips.com> Reviewed-by: Dmitry Baryshkov <dmitry.barysh...@oss.qualcomm.com> --- Changes in v4: - Rename analogix_dp_find_panel_or_bridge() to analogix_dp_finish_probe(). --- drivers/gpu/drm/exynos/exynos_dp.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 0ec3514912f4..a557ec6fda40 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -231,9 +231,6 @@ static int exynos_dp_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *np; struct exynos_dp_device *dp; - struct drm_panel *panel; - struct drm_bridge *bridge; - int ret; dp = devm_kzalloc(&pdev->dev, sizeof(struct exynos_dp_device), GFP_KERNEL); @@ -260,26 +257,22 @@ static int exynos_dp_probe(struct platform_device *pdev) goto out; } - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, &bridge); - if (ret == -ENODEV) - ret = exynos_dp_dt_parse_legacy_bridge(dp, &bridge); - if (ret) - return ret; - /* The remote port can be either a panel or a bridge */ - dp->plat_data.panel = panel; - dp->plat_data.next_bridge = bridge; dp->plat_data.dev_type = EXYNOS_DP; dp->plat_data.power_on = exynos_dp_poweron; dp->plat_data.power_off = exynos_dp_poweroff; dp->plat_data.attach = exynos_dp_bridge_attach; + dp->plat_data.ops = &exynos_dp_ops; out: dp->adp = analogix_dp_probe(dev, &dp->plat_data); if (IS_ERR(dp->adp)) return PTR_ERR(dp->adp); - return component_add(&pdev->dev, &exynos_dp_ops); + if (np || !exynos_dp_dt_parse_legacy_bridge(dp, &dp->plat_data.next_bridge)) + return component_add(&pdev->dev, &exynos_dp_ops); + else + return analogix_dp_finish_probe(dp->adp); } static void exynos_dp_remove(struct platform_device *pdev) -- 2.34.1