Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f78709a5 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Linus Walleij
Browse files

gpio: tegra: Fix tegra_gpio_irq_set_type() 



Commit 36b31279 ("gpiolib: Respect error code of ->get_direction()")
broke tegra_gpio_irq_set_type() because requesting of GPIO direction must
be done after enabling GPIO function for a pin.

This patch fixes drivers probe failure like this:

 gpio gpiochip0: (tegra-gpio): gpiochip_lock_as_irq: cannot get GPIO direction
 tegra-gpio 6000d000.gpio: unable to lock Tegra GPIO 144 as IRQ

Fixes: 36b31279 ("gpiolib: Respect error code of ->get_direction()")
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Acked-by: default avatarJon Hunter <jonathanh@nvidia.com>
Tested-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c19fdaee

drivers/gpio/gpio-tegra.c

+8 −7
Original line number Diff line number Diff line
@@ -323,13 +323,6 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
		return -EINVAL;

	}



	ret = gpiochip_lock_as_irq(&tgi->gc, gpio);

	if (ret) {

		dev_err(tgi->dev,

			"unable to lock Tegra GPIO %u as IRQ\n", gpio);

		return ret;

	}



	spin_lock_irqsave(&bank->lvl_lock[port], flags);



	val = tegra_gpio_readl(tgi, GPIO_INT_LVL(tgi, gpio));
@@ -342,6 +335,14 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
	tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, gpio), gpio, 0);

	tegra_gpio_enable(tgi, gpio);



	ret = gpiochip_lock_as_irq(&tgi->gc, gpio);

	if (ret) {

		dev_err(tgi->dev,

			"unable to lock Tegra GPIO %u as IRQ\n", gpio);

		tegra_gpio_disable(tgi, gpio);

		return ret;

	}



	if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))

		irq_set_handler_locked(d, handle_level_irq);

	else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))