Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14403b3a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: Fix support for sparsely populated ports"

parents f0aa6cf9 9c374145

drivers/hwtracing/coresight/coresight.c

+2 −0
Original line number Diff line number Diff line
@@ -1398,6 +1398,8 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) 
		}



		for (i = 0; i < csdev->nr_outport; i++) {

			if (desc->pdata->child_names[i] == NULL)

				continue;

			conns[i].outport = desc->pdata->outports[i];

			conns[i].child_name = desc->pdata->child_names[i];

			conns[i].child_port = desc->pdata->child_ports[i];

drivers/hwtracing/coresight/of_coresight.c

+8 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static void of_coresight_get_ports(const struct device_node *node, 
	struct device_node *ep = NULL;

	int in = 0, out = 0;

	struct device_node *ports = NULL, *port = NULL;

	struct of_endpoint endpoint;



	ports = of_get_child_by_name(node, "ports");

	port = of_get_child_by_name(node, "port");
@@ -70,10 +71,15 @@ static void of_coresight_get_ports(const struct device_node *node, 
		if (!ep)

			break;



		if (of_graph_parse_endpoint(ep, &endpoint))

			continue;



		if (of_property_read_bool(ep, "slave-mode"))

			in++;

			in = (endpoint.port + 1 > in) ?

				endpoint.port + 1 : in;

		else

			out++;

			out = (endpoint.port + 1) > out ?

				endpoint.port + 1 : out;



	} while (ep);