Commit 68b979d0 authored by Sakari Ailus's avatar Sakari Ailus Committed by Rafael J. Wysocki
Browse files

device property: Add iomap to fwnode operations 



Add iomap() fwnode operation to implement fwnode_iomap() through fwnode
operations, moving the code in fwnode_iomap() to OF framework.

Note that the IS_ENABLED(CONFIG_OF_ADDRESS) && is_of_node(fwnode) check is
needed for Sparc that has its own implementation of of_iomap anyway. Let
the pre-compiler to handle that check.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 55dcbc05

drivers/base/property.c

+1 −4
Original line number Diff line number Diff line
@@ -887,10 +887,7 @@ EXPORT_SYMBOL_GPL(device_get_phy_mode); 
 */

void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index)

{

	if (IS_ENABLED(CONFIG_OF_ADDRESS) && is_of_node(fwnode))

		return of_iomap(to_of_node(fwnode), index);



	return NULL;

	return fwnode_call_ptr_op(fwnode, iomap, index);

}

EXPORT_SYMBOL(fwnode_iomap);

drivers/of/property.c

+10 −0
Original line number Diff line number Diff line
@@ -1465,6 +1465,15 @@ static int of_link_property(struct device_node *con_np, const char *prop_name) 
	return 0;

}



static void __iomem *of_fwnode_iomap(struct fwnode_handle *fwnode, int index)

{

#ifdef CONFIG_OF_ADDRESS

	return of_iomap(to_of_node(fwnode), index);

#else

	return NULL;

#endif

}



static int of_fwnode_add_links(struct fwnode_handle *fwnode)

{

	struct property *p;
@@ -1502,6 +1511,7 @@ const struct fwnode_operations of_fwnode_ops = { 
	.graph_get_remote_endpoint = of_fwnode_graph_get_remote_endpoint,

	.graph_get_port_parent = of_fwnode_graph_get_port_parent,

	.graph_parse_endpoint = of_fwnode_graph_parse_endpoint,

	.iomap = of_fwnode_iomap,

	.add_links = of_fwnode_add_links,

};

EXPORT_SYMBOL_GPL(of_fwnode_ops);

include/linux/fwnode.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ struct fwnode_operations { 
	(*graph_get_port_parent)(struct fwnode_handle *fwnode);

	int (*graph_parse_endpoint)(const struct fwnode_handle *fwnode,

				    struct fwnode_endpoint *endpoint);

	void __iomem *(*iomap)(struct fwnode_handle *fwnode, int index);

	int (*add_links)(struct fwnode_handle *fwnode);

};