The initial design was recursive to cover all port/endpoints, but only the first layer of endpoints should be covered by the components list. This also breaks the MIPI-DSI init/bridge attach sequence, thus only parse the first endpoints instead of recursing.
Signed-off-by: Neil Armstrong narmstrong@baylibre.com --- drivers/gpu/drm/meson/meson_drv.c | 48 +++++-------------------------- 1 file changed, 7 insertions(+), 41 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 92346653223f..1a4cf910c6a0 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -449,46 +449,6 @@ static int compare_of(struct device *dev, void *data) return dev->of_node == data; }
-/* Possible connectors nodes to ignore */ -static const struct of_device_id connectors_match[] = { - { .compatible = "composite-video-connector" }, - { .compatible = "svideo-connector" }, - { .compatible = "hdmi-connector" }, - { .compatible = "dvi-connector" }, - {} -}; - -static int meson_probe_remote(struct platform_device *pdev, - struct component_match **match, - struct device_node *parent, - struct device_node *remote) -{ - struct device_node *ep, *remote_node; - int count = 1; - - /* If node is a connector, return and do not add to match table */ - if (of_match_node(connectors_match, remote)) - return 1; - - component_match_add(&pdev->dev, match, compare_of, remote); - - for_each_endpoint_of_node(remote, ep) { - remote_node = of_graph_get_remote_port_parent(ep); - if (!remote_node || - remote_node == parent || /* Ignore parent endpoint */ - !of_device_is_available(remote_node)) { - of_node_put(remote_node); - continue; - } - - count += meson_probe_remote(pdev, match, remote, remote_node); - - of_node_put(remote_node); - } - - return count; -} - static int meson_drv_probe(struct platform_device *pdev) { struct component_match *match = NULL; @@ -503,8 +463,14 @@ static int meson_drv_probe(struct platform_device *pdev) continue; }
- count += meson_probe_remote(pdev, &match, np, remote); + DRM_DEBUG_DRIVER("parent %pOF remote %pOF\n", np, remote); + + DRM_DEBUG_DRIVER("match add %pOF parent %s\n", remote, dev_name(&pdev->dev)); + component_match_add(&pdev->dev, &match, compare_of, remote); + of_node_put(remote); + + ++count; }
if (count && !match)