* [PATCH v2 0/2] Add support for software nodes to gpiolib
@ 2019-09-13 3:22 Dmitry Torokhov
2019-09-13 3:22 ` [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index() Dmitry Torokhov
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Dmitry Torokhov @ 2019-09-13 3:22 UTC (permalink / raw)
To: Linus Walleij
Cc: Andy Shevchenko, Mika Westerberg, linux-kernel, linux-gpio,
Bartosz Golaszewski
This is a part of the larger series previously posted at
https://lore.kernel.org/linux-gpio/20190911075215.78047-1-dmitry.torokhov@gmail.com
that was rebased on top of linux-gpio devel branch.
Changes in v2:
- switched export to be EXPORT_SYMBOL_GPL to match the new export
markings for the rest of GPIO devres functions
- rebased on top of Linus W devel branch
- added Andy's Reviewed-by
Dmitry Torokhov (2):
gpiolib: introduce devm_fwnode_gpiod_get_index()
gpiolib: introduce fwnode_gpiod_get_index()
drivers/gpio/gpiolib-devres.c | 33 ++++++---------------
drivers/gpio/gpiolib.c | 48 +++++++++++++++++++++++++++++++
include/linux/gpio/consumer.h | 54 ++++++++++++++++++++++++++++-------
3 files changed, 101 insertions(+), 34 deletions(-)
--
2.23.0.237.gc6a4ce50a0-goog
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index()
2019-09-13 3:22 [PATCH v2 0/2] Add support for software nodes to gpiolib Dmitry Torokhov
@ 2019-09-13 3:22 ` Dmitry Torokhov
2019-09-13 9:40 ` Mika Westerberg
2019-10-07 13:03 ` Applied "gpiolib: introduce devm_fwnode_gpiod_get_index()" to the regulator tree Mark Brown
2019-09-13 3:22 ` [PATCH v2 2/2] gpiolib: introduce fwnode_gpiod_get_index() Dmitry Torokhov
2019-10-03 10:07 ` [PATCH v2 0/2] Add support for software nodes to gpiolib Linus Walleij
2 siblings, 2 replies; 10+ messages in thread
From: Dmitry Torokhov @ 2019-09-13 3:22 UTC (permalink / raw)
To: Linus Walleij
Cc: Andy Shevchenko, Mika Westerberg, linux-kernel, linux-gpio,
Bartosz Golaszewski
devm_fwnode_get_index_gpiod_from_child() is too long, besides the fwnode
in question does not have to be a child of device node. Let's rename it
to devm_fwnode_gpiod_get_index() and keep the old name for compatibility
for now.
Also let's add a devm_fwnode_gpiod_get() wrapper as majority of the
callers need a single GPIO.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
Changes in v2:
- switched export to be EXPORT_SYMBOL_GPL to match the new export
markings for the rest of GPIO devres functions
- rebased on top of Linus W devel branch
- added Andy's Reviewed-by
drivers/gpio/gpiolib-devres.c | 19 ++++++++--------
include/linux/gpio/consumer.h | 41 ++++++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/drivers/gpio/gpiolib-devres.c b/drivers/gpio/gpiolib-devres.c
index 98e3c20d9730..9a0475c87f95 100644
--- a/drivers/gpio/gpiolib-devres.c
+++ b/drivers/gpio/gpiolib-devres.c
@@ -185,12 +185,11 @@ struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev,
EXPORT_SYMBOL_GPL(devm_gpiod_get_from_of_node);
/**
- * devm_fwnode_get_index_gpiod_from_child - get a GPIO descriptor from a
- * device's child node
+ * devm_fwnode_gpiod_get_index - get a GPIO descriptor from a given node
* @dev: GPIO consumer
+ * @fwnode: firmware node containing GPIO reference
* @con_id: function within the GPIO consumer
* @index: index of the GPIO to obtain in the consumer
- * @child: firmware node (child of @dev)
* @flags: GPIO initialization flags
* @label: label to attach to the requested GPIO
*
@@ -200,11 +199,11 @@ EXPORT_SYMBOL_GPL(devm_gpiod_get_from_of_node);
* On successful request the GPIO pin is configured in accordance with
* provided @flags.
*/
-struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
- const char *con_id, int index,
- struct fwnode_handle *child,
- enum gpiod_flags flags,
- const char *label)
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+ struct fwnode_handle *fwnode,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label)
{
char prop_name[32]; /* 32 is max size of property name */
struct gpio_desc **dr;
@@ -224,7 +223,7 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
snprintf(prop_name, sizeof(prop_name), "%s",
gpio_suffixes[i]);
- desc = fwnode_get_named_gpiod(child, prop_name, index, flags,
+ desc = fwnode_get_named_gpiod(fwnode, prop_name, index, flags,
label);
if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
break;
@@ -239,7 +238,7 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
return desc;
}
-EXPORT_SYMBOL_GPL(devm_fwnode_get_index_gpiod_from_child);
+EXPORT_SYMBOL_GPL(devm_fwnode_gpiod_get_index);
/**
* devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional()
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index b70af921c614..dc0ddcd30515 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -176,11 +176,11 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, int index,
enum gpiod_flags dflags,
const char *label);
-struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
- const char *con_id, int index,
- struct fwnode_handle *child,
- enum gpiod_flags flags,
- const char *label);
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+ struct fwnode_handle *child,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label);
#else /* CONFIG_GPIOLIB */
@@ -531,6 +531,29 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
return ERR_PTR(-ENOSYS);
}
+static inline
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+ struct fwnode_handle *fwnode,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label)
+{
+ return ERR_PTR(-ENOSYS);
+}
+
+#endif /* CONFIG_GPIOLIB */
+
+static inline
+struct gpio_desc *devm_fwnode_gpiod_get(struct device *dev,
+ struct fwnode_handle *fwnode,
+ const char *con_id,
+ enum gpiod_flags flags,
+ const char *label)
+{
+ return devm_fwnode_gpiod_get_index(dev, fwnode, con_id, 0,
+ flags, label);
+}
+
static inline
struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
const char *con_id, int index,
@@ -538,11 +561,10 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
enum gpiod_flags flags,
const char *label)
{
- return ERR_PTR(-ENOSYS);
+ return devm_fwnode_gpiod_get_index(dev, child, con_id, index,
+ flags, label);
}
-#endif /* CONFIG_GPIOLIB */
-
static inline
struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
const char *con_id,
@@ -550,8 +572,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
enum gpiod_flags flags,
const char *label)
{
- return devm_fwnode_get_index_gpiod_from_child(dev, con_id, 0, child,
- flags, label);
+ return devm_fwnode_gpiod_get_index(dev, child, con_id, 0, flags, label);
}
#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_OF_GPIO)
--
2.23.0.237.gc6a4ce50a0-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] gpiolib: introduce fwnode_gpiod_get_index()
2019-09-13 3:22 [PATCH v2 0/2] Add support for software nodes to gpiolib Dmitry Torokhov
2019-09-13 3:22 ` [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index() Dmitry Torokhov
@ 2019-09-13 3:22 ` Dmitry Torokhov
2019-09-13 9:41 ` Mika Westerberg
2019-10-03 10:07 ` [PATCH v2 0/2] Add support for software nodes to gpiolib Linus Walleij
2 siblings, 1 reply; 10+ messages in thread
From: Dmitry Torokhov @ 2019-09-13 3:22 UTC (permalink / raw)
To: Linus Walleij
Cc: Andy Shevchenko, Mika Westerberg, linux-kernel, linux-gpio,
Bartosz Golaszewski
This introduces fwnode_gpiod_get_index() that iterates through common gpio
suffixes when trying to locate a GPIO within a given firmware node.
We also switch devm_fwnode_gpiod_get_index() to call
fwnode_gpiod_get_index() instead of iterating through GPIO suffixes on
its own.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
Changes in v2:
- rebased on top of Linus W devel branch
- added Andy's Reviewed-by
drivers/gpio/gpiolib-devres.c | 16 +-----------
drivers/gpio/gpiolib.c | 48 +++++++++++++++++++++++++++++++++++
include/linux/gpio/consumer.h | 13 ++++++++++
3 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/drivers/gpio/gpiolib-devres.c b/drivers/gpio/gpiolib-devres.c
index 9a0475c87f95..4421be09b960 100644
--- a/drivers/gpio/gpiolib-devres.c
+++ b/drivers/gpio/gpiolib-devres.c
@@ -205,29 +205,15 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
enum gpiod_flags flags,
const char *label)
{
- char prop_name[32]; /* 32 is max size of property name */
struct gpio_desc **dr;
struct gpio_desc *desc;
- unsigned int i;
dr = devres_alloc(devm_gpiod_release, sizeof(struct gpio_desc *),
GFP_KERNEL);
if (!dr)
return ERR_PTR(-ENOMEM);
- for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
- if (con_id)
- snprintf(prop_name, sizeof(prop_name), "%s-%s",
- con_id, gpio_suffixes[i]);
- else
- snprintf(prop_name, sizeof(prop_name), "%s",
- gpio_suffixes[i]);
-
- desc = fwnode_get_named_gpiod(fwnode, prop_name, index, flags,
- label);
- if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
- break;
- }
+ desc = fwnode_gpiod_get_index(fwnode, con_id, index, flags, label);
if (IS_ERR(desc)) {
devres_free(dr);
return desc;
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 158e327a1285..11a6f4777436 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -4317,6 +4317,54 @@ static int platform_gpio_count(struct device *dev, const char *con_id)
return count;
}
+/**
+ * fwnode_gpiod_get_index - obtain a GPIO from firmware node
+ * @fwnode: handle of the firmware node
+ * @con_id: function within the GPIO consumer
+ * @index: index of the GPIO to obtain for the consumer
+ * @flags: GPIO initialization flags
+ * @label: label to attach to the requested GPIO
+ *
+ * This function can be used for drivers that get their configuration
+ * from opaque firmware.
+ *
+ * The function properly finds the corresponding GPIO using whatever is the
+ * underlying firmware interface and then makes sure that the GPIO
+ * descriptor is requested before it is returned to the caller.
+ *
+ * Returns:
+ * On successful request the GPIO pin is configured in accordance with
+ * provided @flags.
+ *
+ * In case of error an ERR_PTR() is returned.
+ */
+struct gpio_desc *fwnode_gpiod_get_index(struct fwnode_handle *fwnode,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label)
+{
+ struct gpio_desc *desc;
+ char prop_name[32]; /* 32 is max size of property name */
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
+ if (con_id)
+ snprintf(prop_name, sizeof(prop_name), "%s-%s",
+ con_id, gpio_suffixes[i]);
+ else
+ snprintf(prop_name, sizeof(prop_name), "%s",
+ gpio_suffixes[i]);
+
+ desc = fwnode_get_named_gpiod(fwnode, prop_name, index, flags,
+ label);
+ if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
+ break;
+ }
+
+ return desc;
+}
+EXPORT_SYMBOL_GPL(fwnode_gpiod_get_index);
+
/**
* gpiod_count - return the number of GPIOs associated with a device / function
* or -ENOENT if no GPIO has been assigned to the requested function
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index dc0ddcd30515..5215fdba6b9a 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -176,6 +176,10 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, int index,
enum gpiod_flags dflags,
const char *label);
+struct gpio_desc *fwnode_gpiod_get_index(struct fwnode_handle *fwnode,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label);
struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
struct fwnode_handle *child,
const char *con_id, int index,
@@ -531,6 +535,15 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
return ERR_PTR(-ENOSYS);
}
+static inline
+struct gpio_desc *fwnode_gpiod_get_index(struct fwnode_handle *fwnode,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label)
+{
+ return ERR_PTR(-ENOSYS);
+}
+
static inline
struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
struct fwnode_handle *fwnode,
--
2.23.0.237.gc6a4ce50a0-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index()
2019-09-13 3:22 ` [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index() Dmitry Torokhov
@ 2019-09-13 9:40 ` Mika Westerberg
2019-09-13 18:13 ` Dmitry Torokhov
2019-10-07 13:03 ` Applied "gpiolib: introduce devm_fwnode_gpiod_get_index()" to the regulator tree Mark Brown
1 sibling, 1 reply; 10+ messages in thread
From: Mika Westerberg @ 2019-09-13 9:40 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Linus Walleij, Andy Shevchenko, linux-kernel, linux-gpio,
Bartosz Golaszewski
On Thu, Sep 12, 2019 at 08:22:38PM -0700, Dmitry Torokhov wrote:
> devm_fwnode_get_index_gpiod_from_child() is too long, besides the fwnode
> in question does not have to be a child of device node. Let's rename it
> to devm_fwnode_gpiod_get_index() and keep the old name for compatibility
> for now.
Shouldn't we convert all the users and drop that monstrosity
devm_fwnode_get_index_gpiod_from_child() completely?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] gpiolib: introduce fwnode_gpiod_get_index()
2019-09-13 3:22 ` [PATCH v2 2/2] gpiolib: introduce fwnode_gpiod_get_index() Dmitry Torokhov
@ 2019-09-13 9:41 ` Mika Westerberg
0 siblings, 0 replies; 10+ messages in thread
From: Mika Westerberg @ 2019-09-13 9:41 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Linus Walleij, Andy Shevchenko, linux-kernel, linux-gpio,
Bartosz Golaszewski
On Thu, Sep 12, 2019 at 08:22:39PM -0700, Dmitry Torokhov wrote:
> This introduces fwnode_gpiod_get_index() that iterates through common gpio
> suffixes when trying to locate a GPIO within a given firmware node.
>
> We also switch devm_fwnode_gpiod_get_index() to call
> fwnode_gpiod_get_index() instead of iterating through GPIO suffixes on
> its own.
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index()
2019-09-13 9:40 ` Mika Westerberg
@ 2019-09-13 18:13 ` Dmitry Torokhov
2019-09-16 8:30 ` Mika Westerberg
0 siblings, 1 reply; 10+ messages in thread
From: Dmitry Torokhov @ 2019-09-13 18:13 UTC (permalink / raw)
To: Mika Westerberg
Cc: Linus Walleij, Andy Shevchenko, linux-kernel, linux-gpio,
Bartosz Golaszewski
On Fri, Sep 13, 2019 at 12:40:07PM +0300, Mika Westerberg wrote:
> On Thu, Sep 12, 2019 at 08:22:38PM -0700, Dmitry Torokhov wrote:
> > devm_fwnode_get_index_gpiod_from_child() is too long, besides the fwnode
> > in question does not have to be a child of device node. Let's rename it
> > to devm_fwnode_gpiod_get_index() and keep the old name for compatibility
> > for now.
>
> Shouldn't we convert all the users and drop that monstrosity
> devm_fwnode_get_index_gpiod_from_child() completely?
Yes, once we land this in 5.4 I will start blasting maintainers with
patches.
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index()
2019-09-13 18:13 ` Dmitry Torokhov
@ 2019-09-16 8:30 ` Mika Westerberg
0 siblings, 0 replies; 10+ messages in thread
From: Mika Westerberg @ 2019-09-16 8:30 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Linus Walleij, Andy Shevchenko, linux-kernel, linux-gpio,
Bartosz Golaszewski
On Fri, Sep 13, 2019 at 11:13:10AM -0700, Dmitry Torokhov wrote:
> On Fri, Sep 13, 2019 at 12:40:07PM +0300, Mika Westerberg wrote:
> > On Thu, Sep 12, 2019 at 08:22:38PM -0700, Dmitry Torokhov wrote:
> > > devm_fwnode_get_index_gpiod_from_child() is too long, besides the fwnode
> > > in question does not have to be a child of device node. Let's rename it
> > > to devm_fwnode_gpiod_get_index() and keep the old name for compatibility
> > > for now.
> >
> > Shouldn't we convert all the users and drop that monstrosity
> > devm_fwnode_get_index_gpiod_from_child() completely?
>
> Yes, once we land this in 5.4 I will start blasting maintainers with
> patches.
OK, thanks for the clarification.
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] Add support for software nodes to gpiolib
2019-09-13 3:22 [PATCH v2 0/2] Add support for software nodes to gpiolib Dmitry Torokhov
2019-09-13 3:22 ` [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index() Dmitry Torokhov
2019-09-13 3:22 ` [PATCH v2 2/2] gpiolib: introduce fwnode_gpiod_get_index() Dmitry Torokhov
@ 2019-10-03 10:07 ` Linus Walleij
2019-10-03 15:53 ` Dmitry Torokhov
2 siblings, 1 reply; 10+ messages in thread
From: Linus Walleij @ 2019-10-03 10:07 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Andy Shevchenko, Mika Westerberg, linux-kernel,
open list:GPIO SUBSYSTEM, Bartosz Golaszewski
On Fri, Sep 13, 2019 at 5:22 AM Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> This is a part of the larger series previously posted at
>
> https://lore.kernel.org/linux-gpio/20190911075215.78047-1-dmitry.torokhov@gmail.com
>
> that was rebased on top of linux-gpio devel branch.
>
> Changes in v2:
> - switched export to be EXPORT_SYMBOL_GPL to match the new export
> markings for the rest of GPIO devres functions
> - rebased on top of Linus W devel branch
> - added Andy's Reviewed-by
I failed to get this into v5.4 because of misc stress, sorry :(
I have queued it on an immutable branch:
https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git/log/?h=ib-fwnode-gpiod-get-index
then pulled that into my devel branch for v5.5.
So you can ask subsystem maintainers to pull this in to do conversions.
Apologies for the inconvenience.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] Add support for software nodes to gpiolib
2019-10-03 10:07 ` [PATCH v2 0/2] Add support for software nodes to gpiolib Linus Walleij
@ 2019-10-03 15:53 ` Dmitry Torokhov
0 siblings, 0 replies; 10+ messages in thread
From: Dmitry Torokhov @ 2019-10-03 15:53 UTC (permalink / raw)
To: Linus Walleij
Cc: Andy Shevchenko, Mika Westerberg, linux-kernel,
open list:GPIO SUBSYSTEM, Bartosz Golaszewski
On Thu, Oct 03, 2019 at 12:07:47PM +0200, Linus Walleij wrote:
> On Fri, Sep 13, 2019 at 5:22 AM Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
>
> > This is a part of the larger series previously posted at
> >
> > https://lore.kernel.org/linux-gpio/20190911075215.78047-1-dmitry.torokhov@gmail.com
> >
> > that was rebased on top of linux-gpio devel branch.
> >
> > Changes in v2:
> > - switched export to be EXPORT_SYMBOL_GPL to match the new export
> > markings for the rest of GPIO devres functions
> > - rebased on top of Linus W devel branch
> > - added Andy's Reviewed-by
>
> I failed to get this into v5.4 because of misc stress, sorry :(
>
> I have queued it on an immutable branch:
> https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git/log/?h=ib-fwnode-gpiod-get-index
> then pulled that into my devel branch for v5.5.
>
> So you can ask subsystem maintainers to pull this in to do conversions.
>
> Apologies for the inconvenience.
Hey, no worries and thank you for making a branch. It does not really
matter if we land it one release earlier or later.
Hope you are feeling better.
--
Dmitry
^ permalink raw reply [flat|nested] 10+ messages in thread
* Applied "gpiolib: introduce devm_fwnode_gpiod_get_index()" to the regulator tree
2019-09-13 3:22 ` [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index() Dmitry Torokhov
2019-09-13 9:40 ` Mika Westerberg
@ 2019-10-07 13:03 ` Mark Brown
1 sibling, 0 replies; 10+ messages in thread
From: Mark Brown @ 2019-10-07 13:03 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Andy Shevchenko, Bartosz Golaszewski, Linus Walleij, linux-gpio,
linux-kernel, Mika Westerberg
The patch
gpiolib: introduce devm_fwnode_gpiod_get_index()
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 2d2f116d69c127099553afe0d87cf9c0bbe2759e Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 12 Sep 2019 20:22:38 -0700
Subject: [PATCH] gpiolib: introduce devm_fwnode_gpiod_get_index()
devm_fwnode_get_index_gpiod_from_child() is too long, besides the fwnode
in question does not have to be a child of device node. Let's rename it
to devm_fwnode_gpiod_get_index() and keep the old name for compatibility
for now.
Also let's add a devm_fwnode_gpiod_get() wrapper as majority of the
callers need a single GPIO.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20190913032240.50333-2-dmitry.torokhov@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/gpio/gpiolib-devres.c | 19 ++++++++--------
include/linux/gpio/consumer.h | 41 ++++++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/drivers/gpio/gpiolib-devres.c b/drivers/gpio/gpiolib-devres.c
index 98e3c20d9730..9a0475c87f95 100644
--- a/drivers/gpio/gpiolib-devres.c
+++ b/drivers/gpio/gpiolib-devres.c
@@ -185,12 +185,11 @@ struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev,
EXPORT_SYMBOL_GPL(devm_gpiod_get_from_of_node);
/**
- * devm_fwnode_get_index_gpiod_from_child - get a GPIO descriptor from a
- * device's child node
+ * devm_fwnode_gpiod_get_index - get a GPIO descriptor from a given node
* @dev: GPIO consumer
+ * @fwnode: firmware node containing GPIO reference
* @con_id: function within the GPIO consumer
* @index: index of the GPIO to obtain in the consumer
- * @child: firmware node (child of @dev)
* @flags: GPIO initialization flags
* @label: label to attach to the requested GPIO
*
@@ -200,11 +199,11 @@ EXPORT_SYMBOL_GPL(devm_gpiod_get_from_of_node);
* On successful request the GPIO pin is configured in accordance with
* provided @flags.
*/
-struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
- const char *con_id, int index,
- struct fwnode_handle *child,
- enum gpiod_flags flags,
- const char *label)
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+ struct fwnode_handle *fwnode,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label)
{
char prop_name[32]; /* 32 is max size of property name */
struct gpio_desc **dr;
@@ -224,7 +223,7 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
snprintf(prop_name, sizeof(prop_name), "%s",
gpio_suffixes[i]);
- desc = fwnode_get_named_gpiod(child, prop_name, index, flags,
+ desc = fwnode_get_named_gpiod(fwnode, prop_name, index, flags,
label);
if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
break;
@@ -239,7 +238,7 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
return desc;
}
-EXPORT_SYMBOL_GPL(devm_fwnode_get_index_gpiod_from_child);
+EXPORT_SYMBOL_GPL(devm_fwnode_gpiod_get_index);
/**
* devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional()
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index b70af921c614..dc0ddcd30515 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -176,11 +176,11 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
const char *propname, int index,
enum gpiod_flags dflags,
const char *label);
-struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
- const char *con_id, int index,
- struct fwnode_handle *child,
- enum gpiod_flags flags,
- const char *label);
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+ struct fwnode_handle *child,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label);
#else /* CONFIG_GPIOLIB */
@@ -531,6 +531,29 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
return ERR_PTR(-ENOSYS);
}
+static inline
+struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
+ struct fwnode_handle *fwnode,
+ const char *con_id, int index,
+ enum gpiod_flags flags,
+ const char *label)
+{
+ return ERR_PTR(-ENOSYS);
+}
+
+#endif /* CONFIG_GPIOLIB */
+
+static inline
+struct gpio_desc *devm_fwnode_gpiod_get(struct device *dev,
+ struct fwnode_handle *fwnode,
+ const char *con_id,
+ enum gpiod_flags flags,
+ const char *label)
+{
+ return devm_fwnode_gpiod_get_index(dev, fwnode, con_id, 0,
+ flags, label);
+}
+
static inline
struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
const char *con_id, int index,
@@ -538,11 +561,10 @@ struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
enum gpiod_flags flags,
const char *label)
{
- return ERR_PTR(-ENOSYS);
+ return devm_fwnode_gpiod_get_index(dev, child, con_id, index,
+ flags, label);
}
-#endif /* CONFIG_GPIOLIB */
-
static inline
struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
const char *con_id,
@@ -550,8 +572,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
enum gpiod_flags flags,
const char *label)
{
- return devm_fwnode_get_index_gpiod_from_child(dev, con_id, 0, child,
- flags, label);
+ return devm_fwnode_gpiod_get_index(dev, child, con_id, 0, flags, label);
}
#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_OF_GPIO)
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-10-07 13:03 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-13 3:22 [PATCH v2 0/2] Add support for software nodes to gpiolib Dmitry Torokhov
2019-09-13 3:22 ` [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index() Dmitry Torokhov
2019-09-13 9:40 ` Mika Westerberg
2019-09-13 18:13 ` Dmitry Torokhov
2019-09-16 8:30 ` Mika Westerberg
2019-10-07 13:03 ` Applied "gpiolib: introduce devm_fwnode_gpiod_get_index()" to the regulator tree Mark Brown
2019-09-13 3:22 ` [PATCH v2 2/2] gpiolib: introduce fwnode_gpiod_get_index() Dmitry Torokhov
2019-09-13 9:41 ` Mika Westerberg
2019-10-03 10:07 ` [PATCH v2 0/2] Add support for software nodes to gpiolib Linus Walleij
2019-10-03 15:53 ` Dmitry Torokhov
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).