From: Michael Walle <michael@walle.cc>
To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Michael Walle <michael@walle.cc>
Subject: [PATCH 3/3] of: base: add of_parse_phandle_with_optional_args()
Date: Thu, 13 Jan 2022 09:52:08 +0100 [thread overview]
Message-ID: <20220113085208.2636517-4-michael@walle.cc> (raw)
In-Reply-To: <20220113085208.2636517-1-michael@walle.cc>
Add a new variant of the of_parse_phandle_with_args() which treats the
cells name as optional. If it's missing, it is assumed that the phandle
has no arguments.
Up until now, a nvmem node didn't have any arguments, so all the device
trees haven't any '#*-cells' property. But there is a need for an
additional argument for the phandle, for which we need a '#*-cells'
property. Therefore, we need to support nvmem nodes with and without
this property.
Signed-off-by: Michael Walle <michael@walle.cc>
---
include/linux/of.h | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/include/linux/of.h b/include/linux/of.h
index df3af6d3cbe3..f29f18aa95d9 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -521,6 +521,26 @@ static inline int of_parse_phandle_with_fixed_args(const struct device_node *np,
index, out_args);
}
+/**
+ * of_parse_phandle_with_optional_args() - Find a node pointed by phandle in a list
+ *
+ * Same as of_parse_phandle_args() except that if the cells_name property is
+ * not found, cell_count of 0 is assumed.
+ *
+ * This is used to useful, if you have a phandle which didn't have arguments
+ * before and thus doesn't have a '#*-cells' property but is now migrated to
+ * having arguments while retaining backwards compatibility.
+ */
+static inline int of_parse_phandle_with_optional_args(const struct device_node *np,
+ const char *list_name,
+ const char *cells_name,
+ unsigned int index,
+ struct of_phandle_args *out_args)
+{
+ return __of_parse_phandle_with_args(np, list_name, cells_name,
+ 0, index, out_args);
+}
+
/**
* of_property_read_u8_array - Find and read an array of u8 from a property.
*
@@ -1014,6 +1034,15 @@ static inline int of_parse_phandle_with_fixed_args(const struct device_node *np,
return -ENOSYS;
}
+static inline int of_parse_phandle_with_optional_args(const struct device_node *np,
+ char *list_name,
+ int cells_count,
+ unsigned int index,
+ struct of_phandle_args *out_args)
+{
+ return -ENOSYS;
+}
+
static inline int of_count_phandle_with_args(const struct device_node *np,
const char *list_name,
const char *cells_name)
--
2.30.2
next prev parent reply other threads:[~2022-01-13 8:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 8:52 [PATCH 0/3] of: base: of_parse_phandle() fixes and new variant Michael Walle
2022-01-13 8:52 ` [PATCH 1/3] of: base: convert index to unsigned for of_parse_phandle() Michael Walle
2022-01-14 2:29 ` Rob Herring
2022-01-13 8:52 ` [PATCH 2/3] of: property: use unsigned index for of_link_property() Michael Walle
2022-01-13 8:52 ` Michael Walle [this message]
2022-01-13 12:22 ` [PATCH 0/3] of: base: of_parse_phandle() fixes and new variant Michael Walle
2022-01-14 2:30 ` Rob Herring
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=20220113085208.2636517-4-michael@walle.cc \
--to=michael@walle.cc \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).