|
@@ -134,7 +134,7 @@ static int of_coresight_parse_endpoint(struct device *dev,
|
|
|
int ret = 0;
|
|
|
struct of_endpoint endpoint, rendpoint;
|
|
|
struct device_node *rparent = NULL;
|
|
|
- struct device_node *rport = NULL;
|
|
|
+ struct device_node *rep = NULL;
|
|
|
struct device *rdev = NULL;
|
|
|
|
|
|
do {
|
|
@@ -142,16 +142,16 @@ static int of_coresight_parse_endpoint(struct device *dev,
|
|
|
if (of_graph_parse_endpoint(ep, &endpoint))
|
|
|
break;
|
|
|
/*
|
|
|
- * Get a handle on the remote port and parent
|
|
|
- * attached to it.
|
|
|
+ * Get a handle on the remote endpoint and the device it is
|
|
|
+ * attached to.
|
|
|
*/
|
|
|
- rparent = of_graph_get_remote_port_parent(ep);
|
|
|
- if (!rparent)
|
|
|
+ rep = of_graph_get_remote_endpoint(ep);
|
|
|
+ if (!rep)
|
|
|
break;
|
|
|
- rport = of_graph_get_remote_port(ep);
|
|
|
- if (!rport)
|
|
|
+ rparent = of_graph_get_port_parent(rep);
|
|
|
+ if (!rparent)
|
|
|
break;
|
|
|
- if (of_graph_parse_endpoint(rport, &rendpoint))
|
|
|
+ if (of_graph_parse_endpoint(rep, &rendpoint))
|
|
|
break;
|
|
|
|
|
|
/* If the remote device is not available, defer probing */
|
|
@@ -165,15 +165,15 @@ static int of_coresight_parse_endpoint(struct device *dev,
|
|
|
pdata->child_names[i] = devm_kstrdup(dev,
|
|
|
dev_name(rdev),
|
|
|
GFP_KERNEL);
|
|
|
- pdata->child_ports[i] = rendpoint.id;
|
|
|
+ pdata->child_ports[i] = rendpoint.port;
|
|
|
/* Connection record updated */
|
|
|
ret = 1;
|
|
|
} while (0);
|
|
|
|
|
|
if (rparent)
|
|
|
of_node_put(rparent);
|
|
|
- if (rport)
|
|
|
- of_node_put(rport);
|
|
|
+ if (rep)
|
|
|
+ of_node_put(rep);
|
|
|
if (rdev)
|
|
|
put_device(rdev);
|
|
|
|