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

Commit b8ba92b1 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'topic/of-graph-base' of... 

Merge branch 'topic/of-graph-base' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into dt/property-move

OF graph changes for ALSA conflict with the move of graph functions into
property.c.
parents d20dc149 ac1e6958

drivers/of/base.c

+2 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,7 @@ int of_phandle_iterator_init(struct of_phandle_iterator *it, 


	return 0;

}

EXPORT_SYMBOL_GPL(of_phandle_iterator_init);



int of_phandle_iterator_next(struct of_phandle_iterator *it)

{
@@ -1218,6 +1219,7 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it) 


	return -EINVAL;

}

EXPORT_SYMBOL_GPL(of_phandle_iterator_next);



int of_phandle_iterator_args(struct of_phandle_iterator *it,

			     uint32_t *args,

drivers/of/property.c

+50 −10
Original line number Diff line number Diff line
@@ -683,6 +683,41 @@ struct device_node *of_graph_get_endpoint_by_regs( 
}

EXPORT_SYMBOL(of_graph_get_endpoint_by_regs);



/**

 * of_graph_get_remote_endpoint() - get remote endpoint node

 * @node: pointer to a local endpoint device_node

 *

 * Return: Remote endpoint node associated with remote endpoint node linked

 *	   to @node. Use of_node_put() on it when done.

 */

struct device_node *of_graph_get_remote_endpoint(const struct device_node *node)

{

	/* Get remote endpoint node. */

	return of_parse_phandle(node, "remote-endpoint", 0);

}

EXPORT_SYMBOL(of_graph_get_remote_endpoint);



/**

 * of_graph_get_port_parent() - get port's parent node

 * @node: pointer to a local endpoint device_node

 *

 * Return: device node associated with endpoint node linked

 *	   to @node. Use of_node_put() on it when done.

 */

struct device_node *of_graph_get_port_parent(struct device_node *node)

{

	unsigned int depth;



	/* Walk 3 levels up only if there is 'ports' node. */

	for (depth = 3; depth && node; depth--) {

		node = of_get_next_parent(node);

		if (depth == 2 && of_node_cmp(node->name, "ports"))

			break;

	}

	return node;

}

EXPORT_SYMBOL(of_graph_get_port_parent);



/**

 * of_graph_get_remote_port_parent() - get remote port's parent node

 * @node: pointer to a local endpoint device_node
@@ -694,18 +729,11 @@ struct device_node *of_graph_get_remote_port_parent( 
			       const struct device_node *node)

{

	struct device_node *np;

	unsigned int depth;



	/* Get remote endpoint node. */

	np = of_parse_phandle(node, "remote-endpoint", 0);

	np = of_graph_get_remote_endpoint(node);



	/* Walk 3 levels up only if there is 'ports' node. */

	for (depth = 3; depth && np; depth--) {

		np = of_get_next_parent(np);

		if (depth == 2 && of_node_cmp(np->name, "ports"))

			break;

	}

	return np;

	return of_graph_get_port_parent(np);

}

EXPORT_SYMBOL(of_graph_get_remote_port_parent);
@@ -721,13 +749,25 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node) 
	struct device_node *np;



	/* Get remote endpoint node. */

	np = of_parse_phandle(node, "remote-endpoint", 0);

	np = of_graph_get_remote_endpoint(node);

	if (!np)

		return NULL;

	return of_get_next_parent(np);

}

EXPORT_SYMBOL(of_graph_get_remote_port);



int of_graph_get_endpoint_count(const struct device_node *np)

{

	struct device_node *endpoint;

	int num = 0;



	for_each_endpoint_of_node(np, endpoint)

		num++;



	return num;

}

EXPORT_SYMBOL(of_graph_get_endpoint_count);



/**

 * of_graph_get_remote_node() - get remote parent device_node for given port/endpoint

 * @node: pointer to parent device_node containing graph port/endpoint

include/linux/of_graph.h

+21 −0
Original line number Diff line number Diff line
@@ -43,11 +43,15 @@ struct of_endpoint { 
#ifdef CONFIG_OF

int of_graph_parse_endpoint(const struct device_node *node,

				struct of_endpoint *endpoint);

int of_graph_get_endpoint_count(const struct device_node *np);

struct device_node *of_graph_get_port_by_id(struct device_node *node, u32 id);

struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,

					struct device_node *previous);

struct device_node *of_graph_get_endpoint_by_regs(

		const struct device_node *parent, int port_reg, int reg);

struct device_node *of_graph_get_remote_endpoint(

					const struct device_node *node);

struct device_node *of_graph_get_port_parent(struct device_node *node);

struct device_node *of_graph_get_remote_port_parent(

					const struct device_node *node);

struct device_node *of_graph_get_remote_port(const struct device_node *node);
@@ -61,6 +65,11 @@ static inline int of_graph_parse_endpoint(const struct device_node *node, 
	return -ENOSYS;

}



static inline int of_graph_get_endpoint_count(const struct device_node *np)

{

	return 0;

}



static inline struct device_node *of_graph_get_port_by_id(

					struct device_node *node, u32 id)

{
@@ -80,6 +89,18 @@ static inline struct device_node *of_graph_get_endpoint_by_regs( 
	return NULL;

}



static inline struct device_node *of_graph_get_remote_endpoint(

					const struct device_node *node)

{

	return NULL;

}



static inline struct device_node *of_graph_get_port_parent(

	struct device_node *node)

{

	return NULL;

}



static inline struct device_node *of_graph_get_remote_port_parent(

					const struct device_node *node)

{