Add support for software nodes to gpiolib
v2 cover Add support for software nodes to gpiolib
This is a part of the larger series previously posted at
https://lore.kernel.org/linux-gpio/[email protected]
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(-)
Signature · 1 line
2.23.0.237.gc6a4ce50a0-goog
PATCH v2 1/2 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.
---
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(-)
drivers/gpio/gpiolib-devres.c +9 -10
@@ -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()
include/linux/gpio/consumer.h +31 -10
67 lines not on this page · raw message
Signature · 1 line
2.23.0.237.gc6a4ce50a0-goog
Re: [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index()
Quoted 4 lines · Dmitry Torokhov
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 todevm_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?
Re: [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index()
Quoted 8 lines · Mika Westerberg
Quoted 4 lines · Dmitry Torokhov
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 todevm_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.
Signature · 1 line
Dmitry
Mika Westerberg
Reviewed-byRe: [PATCH v2 1/2] gpiolib: introduce devm_fwnode_gpiod_get_index()
Quoted 7 lines · Dmitry Torokhov
Quoted 6 lines · Mika Westerberg
Quoted 4 lines · Dmitry Torokhov
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 todevm_fwnode_gpiod_get_index()and keep the old name for compatibility for now.
Quoted 5 lines
Quoted 2 lines
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.
Applied "gpiolib: introduce devm_fwnode_gpiod_get_index()" to the regulator tree
In reply to Dmitry TorokhovThe 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 <[email protected]>
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.
--- drivers/gpio/gpiolib-devres.c | 19 ++++++++-------- include/linux/gpio/consumer.h | 41 ++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 20 deletions(-)
drivers/gpio/gpiolib-devres.c +9 -10
@@ -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()
include/linux/gpio/consumer.h +31 -10
67 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 2/2 gpiolib: introduce fwnode_gpiod_get_index()
In reply to Dmitry TorokhovThis 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.
---
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(-)
drivers/gpio/gpiolib-devres.c +1 -15
@@ -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;
drivers/gpio/gpiolib.c +48 -0
54 lines not on this page · raw message
include/linux/gpio/consumer.h +13 -0
@@ -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,
Signature · 1 line
2.23.0.237.gc6a4ce50a0-goog
Re: [PATCH v2 2/2] gpiolib: introduce fwnode_gpiod_get_index()
Quoted 9 lines · Dmitry Torokhov
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 callfwnode_gpiod_get_index()instead of iterating through GPIO suffixes on its own.Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Dmitry Torokhov <[email protected]>
Quoted 11 lines · Dmitry Torokhov
This is a part of the larger series previously posted at
https://lore.kernel.org/linux-gpio/[email protected]
that was rebased on top of linux-gpio devel branch.
Changes in v2:
- switched export to beEXPORT_SYMBOL_GPLto 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
Quoted 17 lines · Linus Walleij
Quoted 11 lines · Dmitry Torokhov
This is a part of the larger series previously posted at
https://lore.kernel.org/linux-gpio/[email protected]
that was rebased on top of linux-gpio devel branch.
Changes in v2:
- switched export to beEXPORT_SYMBOL_GPLto match the new export markings for the rest of GPIO devres functions
- rebased on top of Linus W devel branch
- added Andy's Reviewed-byI failed to get this into v5.4 because of misc stress, sorry :(
Quoted 7 lines
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.
Signature · 1 line
Dmitry