Skip to contentSkip to conversation

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

PATCH New Deepak Das 1 participant 1 message Oct 24, 2016

Subsystems (2)
Arm i.MX and Layerscape GPIO
lore
Share & tools
lore

Deepak Das

author
#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