From: Jianqun Xu <jay.xu@rock-chips.com>
To: heiko@sntech.de
Cc: linus.walleij@linaro.org, linux-rockchip@lists.infradead.org,
linux-gpio@vger.kernel.org, Jianqun Xu <jay.xu@rock-chips.com>
Subject: [PATCH 2/3] gpio: rockchip: get pinctrl node from 'gpio-ranges' property
Date: Fri, 4 Mar 2022 17:05:22 +0800 [thread overview]
Message-ID: <20220304090523.1748297-3-jay.xu@rock-chips.com> (raw)
In-Reply-To: <20220304090523.1748297-1-jay.xu@rock-chips.com>
The dt nodes for rockchip soc designes as
pinctrl: pinctrl {
gpio {
};
};
Currently, we get the pinctrl dt node from parent of gpio, this patch
try to get pinctrl dt node from 'gpio-ranges' property.
After this patch, the dt nodes possible to be
gpio {
gpio-ranges = <&pinctrl xxx>;
};
pinctrl: pinctrl {
};
then the gpio driver could register as platform device itself, but not
populate from pinctrl driver.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
drivers/gpio/gpio-rockchip.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
index 1da0324445cc..46c54dff92db 100644
--- a/drivers/gpio/gpio-rockchip.c
+++ b/drivers/gpio/gpio-rockchip.c
@@ -690,6 +690,9 @@ rockchip_gpio_find_bank(struct pinctrl_dev *pctldev, int id)
int i, found = 0;
info = pinctrl_dev_get_drvdata(pctldev);
+ if (!info)
+ return NULL;
+
bank = info->ctrl->pin_banks;
for (i = 0; i < info->ctrl->nr_banks; i++, bank++) {
if (bank->bank_num == id) {
@@ -705,15 +708,16 @@ static int rockchip_gpio_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
- struct device_node *pctlnp = of_get_parent(np);
+ struct device_node *pctlnp = NULL;
struct pinctrl_dev *pctldev = NULL;
struct rockchip_pin_bank *bank = NULL;
struct rockchip_pin_output_deferred *cfg;
static int gpio;
int id, ret;
- if (!np || !pctlnp)
- return -ENODEV;
+ pctlnp = of_parse_phandle(np, "gpio-ranges", 0);
+ if (!pctlnp)
+ pctlnp = of_get_parent(np);
pctldev = of_pinctrl_get(pctlnp);
if (!pctldev)
--
2.25.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-03-04 9:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 9:05 [PATCH v1 0/3] gpio-rochchip Jianqun Xu
2022-03-04 9:05 ` [PATCH 1/3] gpio: rockchip: make gpio work without cru module Jianqun Xu
2022-03-04 9:05 ` Jianqun Xu [this message]
2022-03-04 9:05 ` [PATCH 3/3] dt-bindings: gpio: rockchip, gpio add optional 'gpio-ranges' Jianqun Xu
-- strict thread matches above, loose matches on Subject: below --
2022-09-01 1:29 [PATCH 0/2] gpio clock-names Jianqun Xu
2022-09-01 1:29 ` [PATCH 2/3] gpio: rockchip: get pinctrl node from 'gpio-ranges' property Jianqun Xu
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=20220304090523.1748297-3-jay.xu@rock-chips.com \
--to=jay.xu@rock-chips.com \
--cc=heiko@sntech.de \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-rockchip@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