gpio, pinctrl, introduce for_each_requested_gpio() helper
Subsystems (7)
PATCH 4/5 gpio: xra1403: Make use of for_each_requested_gpio()
In reply to Andy ShevchenkoMake use of for_each_requested_gpio() instead of home grown analogue.
--- drivers/gpio/gpio-xra1403.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpio/gpio-xra1403.c +2 -6
@@ -121,6 +121,7 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip)struct xra1403 *xra =gpiochip_get_data (chip);int value[XRA_LAST ];int i; +const char *label;unsigned int gcr;unsigned int gsr;
@@ -136,12 +137,7 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip) gcr = value[XRA_GCR +1 ] <<8 | value[XRA_GCR ]; gsr = value[XRA_GSR +1 ] <<8 | value[XRA_GSR ]; -for (i =0 ; i < chip->ngpio; i++) { -const char *label =gpiochip_is_requested (chip, i); - -if (!label) -continue ; - +for_each_requested_gpio (chip, i, label) { seq_printf(s, " gpio-%-3d (%-12s) %s %s\n", chip->base + i, label, (gcr & BIT(i)) ? "in" : "out",
Signature · 1 line
2.27.0.rc2
cover gpio, pinctrl, introduce for_each_requested_gpio() helper
While cleaning up Intel pin control drivers I have noticed that one helper macro can be used widely in GPIO and pin control subsystems. Here we are.
Intel stuff is deliberately excluded, so, this can be applied to the GPIO subsystem into immutable branch that will be propagated to pin control subsystem and TWIMC parties, such as Intel pin control drivers.
Andy Shevchenko (5):
gpiolib: Introduce for_each_requested_gpio_in_range() macro ARM/orion/gpio: Make use of for_each_requested_gpio()
gpio: mvebu: Make use of for_each_requested_gpio()
gpio: xra1403: Make use of for_each_requested_gpio()
pinctrl: at91: Make use of for_each_requested_gpio()
arch/arm/plat-orion/gpio.c | 8 ++------ drivers/gpio/gpio-mvebu.c | 8 ++------ drivers/gpio/gpio-xra1403.c | 8 ++------ drivers/pinctrl/pinctrl-at91.c | 7 ++----- include/linux/gpio/driver.h | 16 ++++++++++++++++ 5 files changed, 24 insertions(+), 23 deletions(-)
Signature · 1 line
2.27.0.rc2
PATCH 1/5 gpiolib: Introduce for_each_requested_gpio_in_range() macro
Introduce for_each_requested_gpio_in_range() macro which helps to iterate over requested GPIO in a range. There are already potential users of it, which are going to be converted by the following patches.
For most of them for_each_requested_gpio() shortcut has been added.
--- include/linux/gpio/driver.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/linux/gpio/driver.h +16 -0
@@ -474,6 +474,22 @@ struct gpio_chip {extern const char *gpiochip_is_requested (struct gpio_chip *gc,unsigned int offset); +/** +* for_each_requested_gpio_in_range - iterates over requested GPIOs in a given range +* @chip: the chip to query +* @i: loop variable +* @base: first GPIO in the range +* @size: amount of GPIOs to check starting from @base +* @label: label of current GPIO +*/ +#define for_each_requested_gpio_in_range (chip, i, base, size, label) \ + for (i = 0; i < size; i++) \ + if ((label = gpiochip_is_requested(chip, base + i)) == NULL) {} else + +/* Iterates over all requested GPIO of the given @chip */ +#define for_each_requested_gpio (chip, i, label) \ + for_each_requested_gpio_in_range(chip, i, 0, chip->ngpio, label) +/* add/remove chips */ extern int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, struct lock_class_key *lock_key,
Signature · 1 line
2.27.0.rc2
PATCH 2/5 ARM/orion/gpio: Make use of for_each_requested_gpio()
In reply to Andy ShevchenkoMake use of for_each_requested_gpio() instead of home grown analogue.
--- arch/arm/plat-orion/gpio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/plat-orion/gpio.c +2 -6
@@ -442,6 +442,7 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)struct orion_gpio_chip *ochip =gpiochip_get_data (chip);u32 out, io_conf, blink, in_pol, data_in, cause, edg_msk, lvl_msk; +const char *label;int i; out =readl_relaxed (GPIO_OUT (ochip));
@@ -453,15 +454,10 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) edg_msk =readl_relaxed (GPIO_EDGE_MASK (ochip)); lvl_msk =readl_relaxed (GPIO_LEVEL_MASK (ochip)); -for (i =0 ; i < chip->ngpio; i++) { -const char *label; +for_each_requested_gpio (chip, i, label) {u32 msk;bool is_out; - label =gpiochip_is_requested (chip, i); -if (!label) -continue ; - msk =1 << i; is_out = !(io_conf & msk);
Signature · 1 line
2.27.0.rc2
PATCH 5/5 pinctrl: at91: Make use of for_each_requested_gpio()
In reply to Andy ShevchenkoMake use of for_each_requested_gpio() instead of home grown analogue.
--- drivers/pinctrl/pinctrl-at91.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/pinctrl/pinctrl-at91.c +2 -5
@@ -1486,14 +1486,11 @@ static void at91_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)int i;struct at91_gpio_chip *at91_gpio =gpiochip_get_data (chip);void __iomem *pio = at91_gpio->regbase; +const char *gpio_label; -for (i =0 ; i < chip->ngpio; i++) { +for_each_requested_gpio (chip, i, gpio_label) {unsigned mask =pin_to_mask (i); -const char *gpio_label; - gpio_label =gpiochip_is_requested (chip, i); -if (!gpio_label) -continue ; mode = at91_gpio->ops->get_periph (pio, mask);seq_printf (s,"[%s] GPIO%s%d: " , gpio_label, chip->label, i);
Signature · 1 line
2.27.0.rc2
PATCH 3/5 gpio: mvebu: Make use of for_each_requested_gpio()
In reply to Andy ShevchenkoMake use of for_each_requested_gpio() instead of home grown analogue.
--- drivers/gpio/gpio-mvebu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpio/gpio-mvebu.c +2 -6
@@ -846,6 +846,7 @@ static void mvebu_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) {struct mvebu_gpio_chip *mvchip =gpiochip_get_data (chip);u32 out, io_conf, blink, in_pol, data_in, cause, edg_msk, lvl_msk; +const char *label;int i;regmap_read (mvchip->regs,GPIO_OUT_OFF + mvchip->offset, &out);
@@ -857,15 +858,10 @@ static void mvebu_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) edg_msk =mvebu_gpio_read_edge_mask (mvchip); lvl_msk =mvebu_gpio_read_level_mask (mvchip); -for (i =0 ; i < chip->ngpio; i++) { -const char *label; +for_each_requested_gpio (chip, i, label) {u32 msk;bool is_out; - label =gpiochip_is_requested (chip, i); -if (!label) -continue ; - msk =BIT (i); is_out = !(io_conf & msk);
Signature · 1 line
2.27.0.rc2
Re: [PATCH v1 2/5] ARM/orion/gpio: Make use of for_each_requested_gpio()
In reply to Andy ShevchenkoQuoted 3 lines · Andy Shevchenko
Make use of
for_each_requested_gpio()instead of home grown analogue.Signed-off-by Andy Shevchenko <[email protected]>
Andrew
Quoted 6 lines · Andy Shevchenko
While cleaning up Intel pin control drivers I have noticed that one helper macro can be used widely in GPIO and pin control subsystems. Here we are.
Intel stuff is deliberately excluded, so, this can be applied to the GPIO subsystem into immutable branch that will be propagated to pin control subsystem and TWIMC parties, such as Intel pin control drivers.
Oh, nice! There it is :)
I applied this to the branch ib-for-each-requested in the GPIO tree and merged into the GPIO devel branch, then I also pulled that into the pinctrl "devel" branch.
Yours,
Linus Walleij
Gregory CLEMENT
maintainerRe: [PATCH v1 2/5] ARM/orion/gpio: Make use of for_each_requested_gpio()
In reply to Andy ShevchenkoQuoted 7 lines · Andy Shevchenko
Make use of
for_each_requested_gpio()instead of home grown analogue.Signed-off-by Andy Shevchenko <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc Gregory Clement <[email protected]>
Applied on mvebu/arm
Thanks,
Gregory
Quoted 36 lines
--- arch/arm/plat-orion/gpio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)arch/arm/plat-orion/gpio.c +2
-6@@ -442,6 +442,7 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)struct orion_gpio_chip *ochip =gpiochip_get_data (chip);u32 out, io_conf, blink, in_pol, data_in, cause, edg_msk, lvl_msk; +const char *label;int i; out =readl_relaxed (GPIO_OUT (ochip));@@ -453,15 +454,10 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) edg_msk =readl_relaxed (GPIO_EDGE_MASK (ochip)); lvl_msk =readl_relaxed (GPIO_LEVEL_MASK (ochip)); -for (i =0 ; i < chip->ngpio; i++) { -const char *label; +for_each_requested_gpio (chip, i, label) {u32 msk;bool is_out; - label =gpiochip_is_requested (chip, i); -if (!label) -continue ; - msk =1 << i; is_out = !(io_conf & msk);Signature · 1 line
2.27.0.rc2
Signature · 3 lines
Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com
Re: [PATCH v1 2/5] ARM/orion/gpio: Make use of for_each_requested_gpio()
Quoted 5 lines · Gregory CLEMENT
Quoted 2 lines · Andy Shevchenko
Make use of
for_each_requested_gpio()instead of home grown analogue.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Andy Shevchenko <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc Gregory Clement <[email protected]>Applied on mvebu/arm
I guess you need to merge an immutable branch from Linus. Does above imply this?
Signature · 2 lines
With Best Regards, Andy Shevchenko