From: "Rafał Miłecki" <zajec5@gmail.com>
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, "Rafał Miłecki" <rafal@milecki.pl>
Subject: [PATCH 2/5] nvmem: core: read OF defined NVMEM cell name from "label" property
Date: Thu, 23 Dec 2021 12:07:52 +0100 [thread overview]
Message-ID: <20211223110755.22722-3-zajec5@gmail.com> (raw)
In-Reply-To: <20211223110755.22722-1-zajec5@gmail.com>
From: Rafał Miłecki <rafal@milecki.pl>
Prefer it over $nodename. Property "label" allows more fancy /
customized names with special characters.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
drivers/nvmem/core.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 23a38dcf0fc4..45c39ac401bd 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -685,6 +685,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
struct device *dev = &nvmem->dev;
struct nvmem_cell_entry *cell;
const __be32 *addr;
+ const char *label;
int len;
parent = dev->of_node;
@@ -708,7 +709,11 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
cell->nvmem = nvmem;
cell->offset = be32_to_cpup(addr++);
cell->bytes = be32_to_cpup(addr);
- cell->name = kasprintf(GFP_KERNEL, "%pOFn", child);
+
+ if (!of_property_read_string(child, "label", &label))
+ cell->name = kasprintf(GFP_KERNEL, "%s", label);
+ else
+ cell->name = kasprintf(GFP_KERNEL, "%pOFn", child);
addr = of_get_property(child, "bits", &len);
if (addr && len == (2 * sizeof(u32))) {
--
2.31.1
next prev parent reply other threads:[~2021-12-23 11:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-23 11:07 [PATCH 0/5] nvmem: support more NVMEM cells variants Rafał Miłecki
2021-12-23 11:07 ` [PATCH 1/5] dt-bindings: nvmem: add "label" property to allow more flexible cells names Rafał Miłecki
2021-12-23 11:07 ` Rafał Miłecki [this message]
2021-12-23 11:07 ` [PATCH 3/5] dt-bindings: nvmem: allow referencing device defined cells by names Rafał Miłecki
2021-12-23 21:18 ` Rob Herring
2021-12-23 21:58 ` Rafał Miłecki
2022-01-04 20:16 ` Rob Herring
2022-01-04 20:50 ` Rafał Miłecki
2022-01-04 20:56 ` Rafał Miłecki
2022-01-10 17:44 ` Rob Herring
2021-12-23 11:07 ` [PATCH 4/5] dt-bindings: nvmem: brcm,nvram: add NVMEM cell to example Rafał Miłecki
2021-12-23 11:07 ` [PATCH 5/5] nvmem: core: add cell name based matching of DT cell nodes Rafał Miłecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211223110755.22722-3-zajec5@gmail.com \
--to=zajec5@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rafal@milecki.pl \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.