diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-06-07 16:00:53 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-07 16:59:43 +0200 |
| commit | 6161715e3f1adecae9e7c160930add4040fa10e9 (patch) | |
| tree | 0e65b3e546d06254ad1adf9b8a7be0f324a2c573 /drivers/gpio/gpio-mxs.c | |
| parent | gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library (diff) | |
| download | linux-6161715e3f1adecae9e7c160930add4040fa10e9.tar.xz linux-6161715e3f1adecae9e7c160930add4040fa10e9.zip | |
gpio/mxs: remove irq_high related implementation
The irq_high stuff was mistakenly copied from mxc gpio driver.
The mxs gpio controller has only one irq line for each 32-pin
gpio port. The patch remove irq_high related codes.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/gpio/gpio-mxs.c')
| -rw-r--r-- | drivers/gpio/gpio-mxs.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c index 9d2dba7199c9..ddde0f44ba70 100644 --- a/drivers/gpio/gpio-mxs.c +++ b/drivers/gpio/gpio-mxs.c @@ -53,7 +53,6 @@ struct mxs_gpio_port { void __iomem *base; int id; int irq; - int irq_high; int virtual_irq_start; struct bgpio_chip bgc; }; @@ -174,21 +173,12 @@ static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc) */ static int mxs_gpio_set_wake_irq(struct irq_data *d, unsigned int enable) { - u32 gpio = irq_to_gpio(d->irq); - u32 gpio_idx = gpio & 0x1f; struct mxs_gpio_port *port = irq_data_get_irq_chip_data(d); - if (enable) { - if (port->irq_high && (gpio_idx >= 16)) - enable_irq_wake(port->irq_high); - else - enable_irq_wake(port->irq); - } else { - if (port->irq_high && (gpio_idx >= 16)) - disable_irq_wake(port->irq_high); - else - disable_irq_wake(port->irq); - } + if (enable) + enable_irq_wake(port->irq); + else + disable_irq_wake(port->irq); return 0; } |