|
@@ -1392,7 +1392,7 @@ static const struct component_ops exynos_dp_ops = {
|
|
|
static int exynos_dp_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct device *dev = &pdev->dev;
|
|
|
- struct device_node *panel_node, *bridge_node, *endpoint;
|
|
|
+ struct device_node *panel_node = NULL, *bridge_node, *endpoint = NULL;
|
|
|
struct exynos_dp_device *dp;
|
|
|
int ret;
|
|
|
|
|
@@ -1403,14 +1403,32 @@ static int exynos_dp_probe(struct platform_device *pdev)
|
|
|
|
|
|
platform_set_drvdata(pdev, dp);
|
|
|
|
|
|
+ /* This is for the backward compatibility. */
|
|
|
panel_node = of_parse_phandle(dev->of_node, "panel", 0);
|
|
|
if (panel_node) {
|
|
|
dp->panel = of_drm_find_panel(panel_node);
|
|
|
of_node_put(panel_node);
|
|
|
if (!dp->panel)
|
|
|
return -EPROBE_DEFER;
|
|
|
+ } else {
|
|
|
+ endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
|
|
|
+ if (endpoint) {
|
|
|
+ panel_node = of_graph_get_remote_port_parent(endpoint);
|
|
|
+ if (panel_node) {
|
|
|
+ dp->panel = of_drm_find_panel(panel_node);
|
|
|
+ of_node_put(panel_node);
|
|
|
+ if (!dp->panel)
|
|
|
+ return -EPROBE_DEFER;
|
|
|
+ } else {
|
|
|
+ DRM_ERROR("no port node for panel device.\n");
|
|
|
+ return -EINVAL;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+ if (endpoint)
|
|
|
+ goto out;
|
|
|
+
|
|
|
endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
|
|
|
if (endpoint) {
|
|
|
bridge_node = of_graph_get_remote_port_parent(endpoint);
|
|
@@ -1423,6 +1441,7 @@ static int exynos_dp_probe(struct platform_device *pdev)
|
|
|
return -EPROBE_DEFER;
|
|
|
}
|
|
|
|
|
|
+out:
|
|
|
pm_runtime_enable(dev);
|
|
|
|
|
|
ret = component_add(&pdev->dev, &exynos_dp_ops);
|