From: Jianqun Xu <jay.xu@rock-chips.com>
To: linus.walleij@linaro.org, heiko@sntech.de, brgl@bgdev.pl,
andriy.shevchenko@linux.intel.com
Cc: robert.moore@intel.com, robh@kernel.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
lenb@kernel.org, rafael@kernel.org,
Jianqun Xu <jay.xu@rock-chips.com>
Subject: [PATCH 18/20] gpio/rockchip: make use of device property
Date: Tue, 20 Sep 2022 18:31:06 +0800 [thread overview]
Message-ID: <20220920103108.23074-19-jay.xu@rock-chips.com> (raw)
In-Reply-To: <20220920103108.23074-1-jay.xu@rock-chips.com>
Get the iomem resource by devm_platform_ioremap_resource and get the irq
by platform_get_irq.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
drivers/gpio/gpio-rockchip.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
index d08435619f12..a94ebd95d285 100644
--- a/drivers/gpio/gpio-rockchip.c
+++ b/drivers/gpio/gpio-rockchip.c
@@ -9,7 +9,6 @@
#include <linux/acpi.h>
#include <linux/bitops.h>
#include <linux/clk.h>
-#include <linux/device.h>
#include <linux/err.h>
#include <linux/gpio/driver.h>
#include <linux/init.h>
@@ -17,6 +16,8 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/of_irq.h>
@@ -651,22 +652,8 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank)
static int rockchip_get_bank_data(struct rockchip_pin_bank *bank)
{
- struct resource res;
int id = 0;
- if (of_address_to_resource(bank->of_node, 0, &res)) {
- dev_err(bank->dev, "cannot find IO resource for bank\n");
- return -ENOENT;
- }
-
- bank->reg_base = devm_ioremap_resource(bank->dev, &res);
- if (IS_ERR(bank->reg_base))
- return PTR_ERR(bank->reg_base);
-
- bank->irq = irq_of_parse_and_map(bank->of_node, 0);
- if (!bank->irq)
- return -EINVAL;
-
bank->clk = of_clk_get(bank->of_node, 0);
if (IS_ERR(bank->clk))
return PTR_ERR(bank->clk);
@@ -765,6 +752,14 @@ static int rockchip_gpio_probe(struct platform_device *pdev)
if (ret)
return ret;
+ bank->reg_base = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(bank->reg_base))
+ return PTR_ERR(bank->reg_base);
+
+ bank->irq = platform_get_irq(pdev, 0);
+ if (bank->irq < 0)
+ return bank->irq;
+
ret = rockchip_gpiolib_register(bank);
if (ret) {
dev_err(bank->dev, "Failed to register gpio %d\n", ret);
--
2.25.1
next prev parent reply other threads:[~2022-09-20 10:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 10:30 [PATCH 00/20] Rockchip pinctrl/GPIO support ACPI Jianqun Xu
2022-09-20 10:30 ` [PATCH 01/20] ACPI: utils: Add acpi_dev_uid_to_integer() helper to get _UID as integer Jianqun Xu
2022-09-20 10:30 ` [PATCH 02/20] pinctrl/rockchip: populate GPIO platform early Jianqun Xu
2022-09-20 10:30 ` [PATCH 03/20] pinctrl/rockchip: use fwnode instead of of_node Jianqun Xu
2022-09-20 10:30 ` [PATCH 04/20] pinctrl/rockchip: switch to use device_get_match_data Jianqun Xu
2022-10-04 7:13 ` Linus Walleij
2022-09-20 10:30 ` [PATCH 05/20] pinctrl/rockchip: of_populate_platform for gpio only for of node Jianqun Xu
2022-09-20 10:30 ` [PATCH 06/20] pinctrl/rockchip: parse dt only if the fwnode is " Jianqun Xu
2022-09-20 10:30 ` [PATCH 07/20] pinctrl/rockchip: print a message if driver probed successfully Jianqun Xu
2022-09-20 10:30 ` [PATCH 08/20] gpiolib: make gpiochip_find_by_name to be common function Jianqun Xu
2022-09-20 10:30 ` [PATCH 09/20] gpio/rockchip: drop 'bank->name' from the driver Jianqun Xu
2022-09-20 10:30 ` [PATCH 10/20] gpio/rockchip: revert deferred output settings on probe Jianqun Xu
2022-09-20 10:30 ` [PATCH 11/20] gpio/rockchip: add of_node for gpiochip Jianqun Xu
2022-10-04 7:14 ` Linus Walleij
2022-10-04 8:30 ` Andy Shevchenko
2022-10-04 9:06 ` Linus Walleij
[not found] ` <2022100814192810242455@rock-chips.com>
2022-10-08 18:21 ` Andy Shevchenko
2022-09-20 10:31 ` [PATCH 12/20] gpio/rockchip: add return check for clock rate set Jianqun Xu
2022-09-30 9:17 ` Bartosz Golaszewski
2022-09-30 9:28 ` Bartosz Golaszewski
2022-09-20 10:31 ` [PATCH 13/20] gpio/rockchip: disable and put clocks when remove Jianqun Xu
2022-09-30 9:23 ` Bartosz Golaszewski
2022-09-20 10:31 ` [PATCH 14/20] gpio/rockchip: switch to use irq_domain_create_linear Jianqun Xu
2022-09-20 10:31 ` [PATCH 15/20] gpio/rockchip: disable and put clocks when gpiolib register failed Jianqun Xu
2022-10-04 7:16 ` Linus Walleij
2022-10-04 7:16 ` Linus Walleij
2022-09-20 10:31 ` [PATCH 16/20] gpio/rockchip: try to get gpio id from uid when ACPI enabled Jianqun Xu
2022-09-20 10:31 ` [PATCH 17/20] gpio/rockchip: print device with fwnode name when probe successful Jianqun Xu
2022-09-30 9:21 ` Bartosz Golaszewski
2022-09-20 10:31 ` Jianqun Xu [this message]
2022-09-20 10:31 ` [PATCH 19/20] gpio/rockchip: make GPIO module work well under ACPI enabled Jianqun Xu
2022-09-20 10:31 ` [PATCH 20/20] pinctrl/rockchip: find existed gpiochip by gpio label 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=20220920103108.23074-19-jay.xu@rock-chips.com \
--to=jay.xu@rock-chips.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=brgl@bgdev.pl \
--cc=heiko@sntech.de \
--cc=lenb@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=rafael@kernel.org \
--cc=robert.moore@intel.com \
--cc=robh@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).