leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device property: Add iomap to fwnode operations

Browse Source 
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: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Sakari Ailus
2022-03-31 15:54:49 +03:00
committed by Rafael J. Wysocki
parent 55dcbc0582
commit 68b979d068
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/property.c
View File

@@ -887,10 +887,7 @@ EXPORT_SYMBOL_GPL(device_get_phy_mode);
*/ */
void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index) void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index)
{ {
if (IS_ENABLED(CONFIG_OF_ADDRESS) && is_of_node(fwnode)) return fwnode_call_ptr_op(fwnode, iomap, index);
return of_iomap(to_of_node(fwnode), index);
return NULL;
} }
EXPORT_SYMBOL(fwnode_iomap); EXPORT_SYMBOL(fwnode_iomap);

10
drivers/of/property.c
View File

@@ -1465,6 +1465,15 @@ static int of_link_property(struct device_node *con_np, const char *prop_name)
return 0; 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) static int of_fwnode_add_links(struct fwnode_handle *fwnode)
{ {
struct property *p; 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_remote_endpoint = of_fwnode_graph_get_remote_endpoint,
.graph_get_port_parent = of_fwnode_graph_get_port_parent, .graph_get_port_parent = of_fwnode_graph_get_port_parent,
.graph_parse_endpoint = of_fwnode_graph_parse_endpoint, .graph_parse_endpoint = of_fwnode_graph_parse_endpoint,
.iomap = of_fwnode_iomap,
.add_links = of_fwnode_add_links, .add_links = of_fwnode_add_links,
}; };
EXPORT_SYMBOL_GPL(of_fwnode_ops); EXPORT_SYMBOL_GPL(of_fwnode_ops);

1
include/linux/fwnode.h
View File

@@ -148,6 +148,7 @@ struct fwnode_operations {
(*graph_get_port_parent)(struct fwnode_handle *fwnode); (*graph_get_port_parent)(struct fwnode_handle *fwnode);
int (*graph_parse_endpoint)(const struct fwnode_handle *fwnode, int (*graph_parse_endpoint)(const struct fwnode_handle *fwnode,
struct fwnode_endpoint *endpoint); struct fwnode_endpoint *endpoint);
void __iomem *(*iomap)(struct fwnode_handle *fwnode, int index);
int (*add_links)(struct fwnode_handle *fwnode); int (*add_links)(struct fwnode_handle *fwnode);
}; };