From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Shuah Khan <shuah@kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Bartosz Golaszewski <brgl@bgdev.pl>
Subject: [PATCH v11 2/6] gpiolib: allow to specify the firmware node in struct gpio_chip
Date: Tue, 30 Nov 2021 16:41:23 +0100 [thread overview]
Message-ID: <20211130154127.12272-3-brgl@bgdev.pl> (raw)
In-Reply-To: <20211130154127.12272-1-brgl@bgdev.pl>
Software nodes allow us to represent hierarchies for device components
that don't have their struct device representation yet - for instance:
banks of GPIOs under a common GPIO expander. The core gpiolib core
however doesn't offer any way of passing this information from the
drivers.
This extends struct gpio_chip with a pointer to fwnode that can be set
by the driver and used to pass device properties for child nodes.
This is similar to how we handle device-tree sub-nodes with
CONFIG_OF_GPIO enabled.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpiolib.c | 15 ++++++++++++++-
include/linux/gpio/driver.h | 2 ++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 22b98a590a88..2a877b4ccdee 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -593,13 +593,26 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
struct lock_class_key *lock_key,
struct lock_class_key *request_key)
{
- struct fwnode_handle *fwnode = gc->parent ? dev_fwnode(gc->parent) : NULL;
+ struct fwnode_handle *fwnode = NULL;
unsigned long flags;
int ret = 0;
unsigned i;
int base = gc->base;
struct gpio_device *gdev;
+#if IS_ENABLED(CONFIG_OF_GPIO)
+ if (gc->of_node && gc->fwnode) {
+ pr_err("%s: tried to set both the of_node and fwnode in gpio_chip\n",
+ __func__);
+ return -EINVAL;
+ }
+#endif /* CONFIG_OF_GPIO */
+
+ if (gc->fwnode)
+ fwnode = gc->fwnode;
+ else if (gc->parent)
+ fwnode = dev_fwnode(gc->parent);
+
/*
* First: allocate and populate the internal stat container, and
* set up the struct device.
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index a673a359e20b..b0728c8ad90c 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -289,6 +289,7 @@ struct gpio_irq_chip {
* number or the name of the SoC IP-block implementing it.
* @gpiodev: the internal state holder, opaque struct
* @parent: optional parent device providing the GPIOs
+ * @fwnode: optional fwnode providing this controller's properties
* @owner: helps prevent removal of modules exporting active GPIOs
* @request: optional hook for chip-specific activation, such as
* enabling module power and clock; may sleep
@@ -377,6 +378,7 @@ struct gpio_chip {
const char *label;
struct gpio_device *gpiodev;
struct device *parent;
+ struct fwnode_handle *fwnode;
struct module *owner;
int (*request)(struct gpio_chip *gc,
--
2.25.1
next prev parent reply other threads:[~2021-11-30 15:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 15:41 [PATCH v11 0/6] gpio-sim: configfs-based GPIO simulator Bartosz Golaszewski
2021-11-30 15:41 ` [PATCH v11 1/6] gpiolib: provide gpiod_remove_hogs() Bartosz Golaszewski
2021-11-30 15:41 ` Bartosz Golaszewski [this message]
2021-11-30 16:14 ` [PATCH v11 2/6] gpiolib: allow to specify the firmware node in struct gpio_chip Andy Shevchenko
2021-11-30 16:19 ` Andy Shevchenko
2021-11-30 16:55 ` Andy Shevchenko
2021-11-30 18:32 ` Bartosz Golaszewski
2021-11-30 20:31 ` Andy Shevchenko
2021-11-30 20:25 ` Bartosz Golaszewski
2021-11-30 20:59 ` Andy Shevchenko
2021-11-30 21:04 ` Bartosz Golaszewski
2021-12-01 13:11 ` Bartosz Golaszewski
2021-12-01 13:39 ` Andy Shevchenko
2021-12-01 13:53 ` Bartosz Golaszewski
2021-12-01 14:28 ` Andy Shevchenko
2021-12-01 14:33 ` Andy Shevchenko
2021-12-01 14:36 ` Bartosz Golaszewski
2021-12-01 14:54 ` Andy Shevchenko
2021-12-02 10:57 ` Andy Shevchenko
2021-12-02 11:24 ` Bartosz Golaszewski
2021-12-02 11:35 ` Andy Shevchenko
2021-12-02 11:37 ` Andy Shevchenko
2021-12-02 13:06 ` Bartosz Golaszewski
2021-12-02 13:44 ` Andy Shevchenko
2021-12-02 13:52 ` Bartosz Golaszewski
2021-12-02 15:40 ` Andy Shevchenko
2021-12-02 17:00 ` Bartosz Golaszewski
2021-12-02 17:29 ` Andy Shevchenko
2021-11-30 15:41 ` [PATCH v11 3/6] gpio: sim: new testing module Bartosz Golaszewski
2021-11-30 15:41 ` [PATCH v11 4/6] selftests: gpio: provide a helper for reading chip info Bartosz Golaszewski
2021-11-30 15:41 ` [PATCH v11 5/6] selftests: gpio: add a helper for reading GPIO line names Bartosz Golaszewski
2021-11-30 15:41 ` [PATCH v11 6/6] selftests: gpio: add test cases for gpio-sim Bartosz Golaszewski
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=20211130154127.12272-3-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=geert@linux-m68k.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=warthog618@gmail.com \
/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).