[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <024fd4500089d479b60580449d3567b8@walle.cc>
Date: Tue, 21 Mar 2023 11:36:05 +0100
From: Michael Walle <michael@...le.cc>
To: Rafał Miłecki <zajec5@...il.com>
Cc: Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Miquel Raynal <miquel.raynal@...tlin.com>,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Rafał Miłecki
<rafal@...ecki.pl>
Subject: Re: [PATCH V5 3/3] nvmem: core: add support for fixed cells *layout*
Am 2023-03-21 11:24, schrieb Rafał Miłecki:
> From: Rafał Miłecki <rafal@...ecki.pl>
>
> This adds support for the "fixed-layout" NVMEM layout binding. It
> allows
> defining NVMEM cells in a layout DT node named "nvmem-layout".
>
> While NVMEM subsystem supports layout drivers it has been discussed
> that
> "fixed-layout" may actually be supperted internally. It's because:
> 1. It's a very basic layout
> 2. It allows sharing code with legacy syntax parsing
> 3. It's safer for soc_device_match() due to -EPROBE_DEFER
> 4. This will make the syntax transition easier
>
> Signed-off-by: Rafał Miłecki <rafal@...ecki.pl>
> ---
> drivers/nvmem/core.c | 32 +++++++++++++++++++++++++++++---
> 1 file changed, 29 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index 212c5ba5789f..591b640f53dd 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -694,7 +694,7 @@ static int nvmem_validate_keepouts(struct
> nvmem_device *nvmem)
> return 0;
> }
>
> -static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
> +static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct
> device_node *np)
> {
> struct nvmem_layout *layout = nvmem->layout;
> struct device *dev = &nvmem->dev;
> @@ -702,7 +702,7 @@ static int nvmem_add_cells_from_of(struct
> nvmem_device *nvmem)
> const __be32 *addr;
> int len, ret;
>
> - for_each_child_of_node(dev->of_node, child) {
> + for_each_child_of_node(np, child) {
> struct nvmem_cell_info info = {0};
>
> addr = of_get_property(child, "reg", &len);
> @@ -740,6 +740,28 @@ static int nvmem_add_cells_from_of(struct
> nvmem_device *nvmem)
> return 0;
> }
>
> +static int nvmem_add_cells_from_legacy_of(struct nvmem_device *nvmem)
> +{
> + return nvmem_add_cells_from_dt(nvmem, nvmem->dev.of_node);
> +}
> +
> +static int nvmem_add_cells_fixed(struct nvmem_device *nvmem)
> +{
> + struct device_node *layout_np;
> + int err = 0;
> +
> + layout_np = of_nvmem_layout_get_container(nvmem);
> + if (!layout_np)
> + return 0;
> +
> + if (of_device_is_compatible(layout_np, "fixed-layout"))
> + err = nvmem_add_cells_from_dt(nvmem, layout_np);
> +
> + of_node_put(layout_np);
> +
> + return err;
> +}
> +
> int __nvmem_layout_register(struct nvmem_layout *layout, struct module
> *owner)
> {
> layout->owner = owner;
> @@ -970,7 +992,7 @@ struct nvmem_device *nvmem_register(const struct
> nvmem_config *config)
> if (rval)
> goto err_remove_cells;
>
> - rval = nvmem_add_cells_from_of(nvmem);
> + rval = nvmem_add_cells_from_legacy_of(nvmem);
> if (rval)
> goto err_remove_cells;
>
> @@ -980,6 +1002,10 @@ struct nvmem_device *nvmem_register(const struct
> nvmem_config *config)
> if (rval)
> goto err_remove_cells;
>
> + rval = nvmem_add_cells_fixed(nvmem);
nvmem_add_cells_from_fixed_layout()?
Reviewed-by: Michael Walle <michael@...le.cc>
> + if (rval)
> + goto err_remove_cells;
> +
> rval = nvmem_add_cells_from_layout(nvmem);
> if (rval)
> goto err_remove_cells;
Powered by blists - more mailing lists