From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/2] pinctrl: rockchip: use alias rather than full of name
Date: Fri, 14 Jan 2022 09:47:56 +0100 [thread overview]
Message-ID: <20220114084757.311697-1-a.fatoum@pengutronix.de> (raw)
From: Michael Riesch <michael.riesch@wolfvision.net>
We've so far relied on GPIO controllers being named "gpioX", while the
binding mandates gpio controllers being just called "gpio". This already
broke rk3288 support and rk3568.dtsi upstream also differs from the
version in barebox' arch/arm/dts in that regard.
Instead, do like Linux does and use the alias to match the controllers to
the GPIO banks with a fallback to probe order.
Fixes: 3f2f5980d517 ("dts: update to v5.16-rc1")
Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
[afa: drop strncmp in favor of id comparison, reword commit message]
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/pinctrl/pinctrl-rockchip.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 5cf77c58b218..ea748b600419 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -877,18 +877,24 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data(
struct rockchip_pin_bank *bank;
char *name;
int grf_offs, pmu_offs, drv_grf_offs, drv_pmu_offs, i, j;
+ int gpio = 0;
match = of_match_node(rockchip_pinctrl_dt_match, node);
ctrl = (struct rockchip_pin_ctrl *)match->data;
for_each_child_of_node(node, np) {
+ int id;
+
if (!of_find_property(np, "gpio-controller", NULL))
continue;
+ id = of_alias_get_id(np, "gpio");
+ if (id < 0)
+ id = gpio++;
+
bank = ctrl->pin_banks;
for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {
- name = bank->name;
- if (!strncmp(name, np->name, strlen(name))) {
+ if (bank->bank_num == id) {
bank->of_node = np;
if (!rockchip_get_bank_data(bank, dev))
bank->valid = true;
--
2.30.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2022-01-14 8:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 8:47 Ahmad Fatoum [this message]
2022-01-14 8:47 ` [PATCH 2/2] pinctrl: Rockchip: abort GPIO probe gracefully on out-of-range alias id Ahmad Fatoum
2022-01-14 8:49 ` [PATCH 1/2] pinctrl: rockchip: use alias rather than full of name Ahmad Fatoum
2022-01-14 9:33 ` Sascha Hauer
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=20220114084757.311697-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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