nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

gpio: pxa: disable pinctrl calls for PXA3xx

Browse source 
The pxa3xx driver uses the pinctrl-single driver since a while which
does not implement a .gpio_set_direction() callback. The pinmux core
will simply return 0 in this case, and the pxa3xx gpio driver hence
believes the pinctrl driver did its job and returns as well.

This effectively makes pxa_gpio_direction_{input,output} no-ops.

To fix this, do not call into the pinctrl subsystem for the PXA3xx
platform for now. We can revert this once the pinctrl-single driver
learned to support setting pin directions.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Daniel Mack 2018-07-13 18:15:38 +02:00 committed by Linus Walleij
parent 4bf4eed44b
commit 9dabfdd84b
1 changed files with 27 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/gpio/gpio-pxa.c
View file

@ -241,6 +241,17 @@ int pxa_irq_to_gpio(int irq)
return irq_gpio0; return irq_gpio0;
} }
static bool pxa_gpio_has_pinctrl(void)
{
switch (gpio_type) {
case PXA3XX_GPIO:
return false;
default:
return true;
}
}
static int pxa_gpio_to_irq(struct gpio_chip *chip, unsigned offset) static int pxa_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{ {
struct pxa_gpio_chip *pchip = chip_to_pxachip(chip); struct pxa_gpio_chip *pchip = chip_to_pxachip(chip);
@ -255,9 +266,11 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
unsigned long flags; unsigned long flags;
int ret; int ret;
ret = pinctrl_gpio_direction_input(chip->base + offset); if (pxa_gpio_has_pinctrl()) {
if (!ret) ret = pinctrl_gpio_direction_input(chip->base + offset);
return 0; if (!ret)
return 0;
}
spin_lock_irqsave(&gpio_lock, flags); spin_lock_irqsave(&gpio_lock, flags);
@ -282,9 +295,11 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,
writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET)); writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
ret = pinctrl_gpio_direction_output(chip->base + offset); if (pxa_gpio_has_pinctrl()) {
if (ret) ret = pinctrl_gpio_direction_output(chip->base + offset);
return ret; if (ret)
return ret;
}
spin_lock_irqsave(&gpio_lock, flags); spin_lock_irqsave(&gpio_lock, flags);
@ -348,8 +363,12 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
pchip->chip.set = pxa_gpio_set; pchip->chip.set = pxa_gpio_set;
pchip->chip.to_irq = pxa_gpio_to_irq; pchip->chip.to_irq = pxa_gpio_to_irq;
pchip->chip.ngpio = ngpio; pchip->chip.ngpio = ngpio;
pchip->chip.request = gpiochip_generic_request;
pchip->chip.free = gpiochip_generic_free; if (pxa_gpio_has_pinctrl()) {
pchip->chip.request = gpiochip_generic_request;
pchip->chip.free = gpiochip_generic_free;
}
#ifdef CONFIG_OF_GPIO #ifdef CONFIG_OF_GPIO
pchip->chip.of_node = np; pchip->chip.of_node = np;
pchip->chip.of_xlate = pxa_gpio_of_xlate; pchip->chip.of_xlate = pxa_gpio_of_xlate;