gpio: mxc: Shift generic request/free after gpiochip registration

PATCH In review Deepak Das 2 participants 2 messages Oct 24, 2016 – Oct 25, 2016

Subsystems (2)

Arm i.MX and Layerscape GPIO

lore

Share & tools

lore

Deepak Das

author

2016-10-24 16:18 UTC #0 lore raw

PATCH 1/1 gpio: mxc: Shift generic request/free after gpiochip registration

generic gpio request/free should be added after gpiocip registration to validate mapping of gpiochip with pinctrl subsystem.

gpiochip->pin_ranges list contains the information used by pinctrl subsystem to configure corresponding pins for gpio usage. This list will be empty if gpiochip fails to map with pinctrl subsystem for any reason.
For Ex.:-
generic gpio request/free should not be used if IOMUX pin controller device node is disabled in device tree.

This commit checks above list and skips adding generic gpio request/free if list is found empty.

Signed-off-by Deepak Das <[email protected]>

Signed-off-by Vladimir Zapolskiy <[email protected]>

---
 drivers/gpio/gpio-mxc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

drivers/gpio/gpio-mxc.c +5 -5

index c1a1e00..9f79a9f 100644
@@ -458,11 +458,6 @@ static int mxc_gpio_probe(struct platform_device *pdev)
        if (err)
                goto out_bgio;
 
-       if (of_property_read_bool(np, "gpio-ranges")) {
-               port->gc.request = gpiochip_generic_request;
-               port->gc.free = gpiochip_generic_free;
-       }
-
        port->gc.to_irq = mxc_gpio_to_irq;
        port->gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 :
                                             pdev->id * 32;

@@ -471,6 +466,11 @@ static int mxc_gpio_probe(struct platform_device *pdev)
        if (err)
                goto out_bgio;
 
+       if (!list_empty(&port->gc.pin_ranges)) {
+               port->gc.request = gpiochip_generic_request;
+               port->gc.free = gpiochip_generic_free;
+       }
+
        irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id());
        if (irq_base < 0) {
                err = irq_base;

Signature · 1 line

1.9.1

Linus Walleij

2016-10-25 12:05 UTC #1 lore raw

Quoted 11 lines · Deepak Das

generic gpio request/free should be added after gpiocip registration to validate mapping of gpiochip with pinctrl subsystem.
gpiochip->pin_ranges list contains the information used by pinctrl subsystem to configure corresponding pins for gpio usage. This list will be empty if gpiochip fails to map with pinctrl subsystem for any reason.
For Ex.:-
generic gpio request/free should not be used if IOMUX pin controller device node is disabled in device tree.

Quoted 5 lines

This commit checks above list and skips adding generic gpio request/free if list is found empty.
Signed-off-by Deepak Das <[email protected]>
Signed-off-by Vladimir Zapolskiy <[email protected]>

Could you:

- Rebase on my fixes or devel branch in the GPIO tree. This doesn't seem to apply cleany on any of my branches, have you tested v4.9-rc2?

- Indicate if this is a regression that need to go into fixes/stable or not?

Yours,
Linus Walleij