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

gpio: ep93xx: Do not pingpong irq numbers

Browse source 
For setting debounce config we want to write an offset in
a per-gpiochip register, and we know which gpiochip we are
on. Instead of a roundtrip over the IRQ number, figure out
what port we are on for this GPIO chip, then index to the
right register and write the value.

This adds the ep93xx_gpio_port() that finds the port index
from a struct gpio_chip * that we can later exploit to
simplify more code.

Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2018-08-22 22:41:07 +02:00
parent 99399f40d8
commit fd935fc421
1 changed files with 23 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,12 +68,29 @@ static void ep93xx_gpio_update_int_params(struct ep93xx_gpio *epg, unsigned port
epg->base + int_en_register_offset[port]); epg->base + int_en_register_offset[port]);
} }
static void ep93xx_gpio_int_debounce(struct ep93xx_gpio *epg, static int ep93xx_gpio_port(struct gpio_chip *gc)
unsigned int irq, bool enable)
{ {
int line = irq_to_gpio(irq); struct ep93xx_gpio *epg = gpiochip_get_data(gc);
int port = line >> 3; int port = 0;
int port_mask = 1 << (line & 7);
while (gc != &epg->gc[port] && port < sizeof(epg->gc))
port++;
/* This should not happen but is there as a last safeguard */
if (gc != &epg->gc[port]) {
pr_crit("can't find the GPIO port\n");
return 0;
}
return port;
}
static void ep93xx_gpio_int_debounce(struct gpio_chip *gc,
unsigned int offset, bool enable)
{
struct ep93xx_gpio *epg = gpiochip_get_data(gc);
int port = ep93xx_gpio_port(gc);
int port_mask = BIT(offset);
if (enable) if (enable)
gpio_int_debounce[port] |= port_mask; gpio_int_debounce[port] |= port_mask;
@ -331,19 +348,13 @@ static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = {
static int ep93xx_gpio_set_config(struct gpio_chip *gc, unsigned offset, static int ep93xx_gpio_set_config(struct gpio_chip *gc, unsigned offset,
unsigned long config) unsigned long config)
{ {
struct ep93xx_gpio *epg = gpiochip_get_data(gc);
int gpio = gc->base + offset;
int irq = gpio_to_irq(gpio);
u32 debounce; u32 debounce;
if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE) if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
return -ENOTSUPP; return -ENOTSUPP;
if (irq < 0)
return -EINVAL;
debounce = pinconf_to_config_argument(config); debounce = pinconf_to_config_argument(config);
ep93xx_gpio_int_debounce(epg, irq, debounce ? true : false); ep93xx_gpio_int_debounce(gc, offset, debounce ? true : false);
return 0; return 0;
} }