openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio/nomadik: use genirq core to track enablement 

Currently the Nomadik GPIO driver tracks enabled/disabled interrupt
status with a local variable, switch to using the interrupt core.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Linus Walleij 2011-09-20 10:50:15 +02:00 committed by Grant Likely
parent 3c0227d262
commit 479a0c7eee
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpio/gpio-nomadik.c
View File

@ -58,7 +58,6 @@ struct nmk_gpio_chip {
u32 rwimsc; u32 rwimsc;
u32 fwimsc; u32 fwimsc;
u32 slpm; u32 slpm;
u32 enabled;
u32 pull_up; u32 pull_up;
}; };
@ -605,11 +604,6 @@ static int nmk_gpio_irq_maskunmask(struct irq_data *d, bool enable)
if (!nmk_chip) if (!nmk_chip)
return -EINVAL; return -EINVAL;
if (enable)
nmk_chip->enabled |= bitmask;
else
nmk_chip->enabled &= ~bitmask;
clk_enable(nmk_chip->clk); clk_enable(nmk_chip->clk);
spin_lock_irqsave(&nmk_gpio_slpm_lock, flags); spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
spin_lock(&nmk_chip->lock); spin_lock(&nmk_chip->lock);
@ -653,7 +647,7 @@ static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
spin_lock_irqsave(&nmk_gpio_slpm_lock, flags); spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
spin_lock(&nmk_chip->lock); spin_lock(&nmk_chip->lock);
if (!(nmk_chip->enabled & bitmask)) if (irqd_irq_disabled(d))
__nmk_gpio_set_wake(nmk_chip, gpio, on); __nmk_gpio_set_wake(nmk_chip, gpio, on);
if (on) if (on)
@ -670,7 +664,7 @@ static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type) static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type)
{ {
bool enabled; bool enabled = !irqd_irq_disabled(d);
bool wake = irqd_is_wakeup_set(d); bool wake = irqd_is_wakeup_set(d);
int gpio; int gpio;
struct nmk_gpio_chip *nmk_chip; struct nmk_gpio_chip *nmk_chip;
@ -691,7 +685,6 @@ static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type)
clk_enable(nmk_chip->clk); clk_enable(nmk_chip->clk);
spin_lock_irqsave(&nmk_chip->lock, flags); spin_lock_irqsave(&nmk_chip->lock, flags);
enabled = !!(nmk_chip->enabled & bitmask);
if (enabled) if (enabled)
__nmk_gpio_irq_modify(nmk_chip, gpio, NORMAL, false); __nmk_gpio_irq_modify(nmk_chip, gpio, NORMAL, false);