From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>,
Saravana Kannan <saravanak@google.com>,
stable@vger.kernel.org
Subject: [PATCH v2] of: property: fw_devlink: do not link ".*,nr-gpios"
Date: Mon, 5 Apr 2021 15:25:40 -0700 [thread overview]
Message-ID: <20210405222540.18145-1-ilya.lipnitskiy@gmail.com> (raw)
In-Reply-To: <20210405031436.2465475-1-ilya.lipnitskiy@gmail.com>
[<vendor>,]nr-gpios property is used by some GPIO drivers[0] to indicate
the number of GPIOs present on a system, not define a GPIO. nr-gpios is
not configured by #gpio-cells and can't be parsed along with other
"*-gpios" properties.
nr-gpios without the "<vendor>," prefix is not allowed by the DT
spec[1], so only add exception for the ",nr-gpios" suffix and let the
error message continue being printed for non-compliant implementations.
[0]: nr-gpios is referenced in Documentation/devicetree/bindings/gpio:
- gpio-adnp.txt
- gpio-xgene-sb.txt
- gpio-xlp.txt
- snps,dw-apb-gpio.yaml
[1]:
Link: https://github.com/devicetree-org/dt-schema/blob/cb53a16a1eb3e2169ce170c071e47940845ec26e/schemas/gpio/gpio-consumer.yaml#L20
Fixes errors such as:
OF: /palmbus@300000/gpio@600: could not find phandle
Fixes: 7f00be96f125 ("of: property: Add device link support for interrupt-parent, dmas and -gpio(s)")
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Cc: Saravana Kannan <saravanak@google.com>
Cc: <stable@vger.kernel.org> # 5.5.x
---
drivers/of/property.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/of/property.c b/drivers/of/property.c
index 2046ae311322..1793303e84ac 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1281,7 +1281,16 @@ DEFINE_SIMPLE_PROP(pinctrl7, "pinctrl-7", NULL)
DEFINE_SIMPLE_PROP(pinctrl8, "pinctrl-8", NULL)
DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
-DEFINE_SUFFIX_PROP(gpios, "-gpios", "#gpio-cells")
+
+static struct device_node *parse_gpios(struct device_node *np,
+ const char *prop_name, int index)
+{
+ if (!strcmp_suffix(prop_name, ",nr-gpios"))
+ return NULL;
+
+ return parse_suffix_prop_cells(np, prop_name, index, "-gpios",
+ "#gpio-cells");
+}
static struct device_node *parse_iommu_maps(struct device_node *np,
const char *prop_name, int index)
--
2.31.1
next prev parent reply other threads:[~2021-04-05 22:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-05 3:14 [PATCH] of: property: do not create device links from *nr-gpios Ilya Lipnitskiy
2021-04-05 20:00 ` Saravana Kannan
2021-04-05 20:10 ` Ilya Lipnitskiy
2021-04-05 20:18 ` Saravana Kannan
2021-04-05 20:55 ` Ilya Lipnitskiy
2021-04-06 17:40 ` Rob Herring
2021-04-06 19:28 ` Ilya Lipnitskiy
2021-04-06 21:28 ` Saravana Kannan
2021-04-06 22:31 ` Rob Herring
2021-04-05 22:25 ` Ilya Lipnitskiy [this message]
2021-04-06 23:09 ` [PATCH v2] of: property: fw_devlink: do not link ".*,nr-gpios" Saravana Kannan
2021-04-07 0:34 ` Rob Herring
2021-04-07 0:45 ` Saravana Kannan
2021-04-07 1:10 ` Rob Herring
2021-04-07 1:24 ` Saravana Kannan
2021-04-07 20:44 ` Ilya Lipnitskiy
2021-04-09 19:26 ` Rob Herring
2021-04-09 19:36 ` Saravana Kannan
2021-04-10 12:08 ` Greg Kroah-Hartman
2021-04-10 8:56 ` Greg Kroah-Hartman
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=20210405222540.18145-1-ilya.lipnitskiy@gmail.com \
--to=ilya.lipnitskiy@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=saravanak@google.com \
--cc=stable@vger.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
all inboxes | Powered by JetHome®