On Sun, Feb 06, 2022 at 11:16:42AM +0200, Sakari Ailus wrote:
> Add iomap() fwnode operation to implement fwnode_iomap() through fwnode
> operations, moving the code in fwnode_iomap() to OF framework.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> ---
> drivers/base/property.c | 5 +----
> drivers/of/property.c | 7 +++++++
> include/linux/fwnode.h | 1 +
> 3 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index 09686e2e903e..83dd22e7cb81 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -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);
>
> diff --git a/drivers/of/property.c b/drivers/of/property.c
> index 676899566f7c..8beb89709740 100644
> --- a/drivers/of/property.c
> +++ b/drivers/of/property.c
> @@ -1465,6 +1465,12 @@ 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)
> +{
> + return IS_ENABLED(CONFIG_OF_ADDRESS) ?
I think this shouldn't be needed. !OF_ADDRESS is Sparc which just has
its own implementation of of_iomap().
> + of_iomap(to_of_node(fwnode), index) : NULL;
> +}
> +
> static int of_fwnode_add_links(struct fwnode_handle *fwnode)
> {
> struct property *p;
> @@ -1502,6 +1508,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);
> diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h
> index 6f307f21fc65..ebbc3bf03f95 100644
> --- a/include/linux/fwnode.h
> +++ b/include/linux/fwnode.h
> @@ -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);
> };
>
> --
> 2.30.2
>
>
