diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-06-07 10:00:53 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-07 10:59:43 -0400 |
commit | 6161715e3f1adecae9e7c160930add4040fa10e9 (patch) | |
tree | 0e65b3e546d06254ad1adf9b8a7be0f324a2c573 /drivers/gpio/gpio-mxs.c | |
parent | 06f88a8ae9085e555baf81edbf967764d87dc12f (diff) |
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 { | |||
53 | void __iomem *base; | 53 | void __iomem *base; |
54 | int id; | 54 | int id; |
55 | int irq; | 55 | int irq; |
56 | int irq_high; | ||
57 | int virtual_irq_start; | 56 | int virtual_irq_start; |
58 | struct bgpio_chip bgc; | 57 | struct bgpio_chip bgc; |
59 | }; | 58 | }; |
@@ -174,21 +173,12 @@ static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc) | |||
174 | */ | 173 | */ |
175 | static int mxs_gpio_set_wake_irq(struct irq_data *d, unsigned int enable) | 174 | static int mxs_gpio_set_wake_irq(struct irq_data *d, unsigned int enable) |
176 | { | 175 | { |
177 | u32 gpio = irq_to_gpio(d->irq); | ||
178 | u32 gpio_idx = gpio & 0x1f; | ||
179 | struct mxs_gpio_port *port = irq_data_get_irq_chip_data(d); | 176 | struct mxs_gpio_port *port = irq_data_get_irq_chip_data(d); |
180 | 177 | ||
181 | if (enable) { | 178 | if (enable) |
182 | if (port->irq_high && (gpio_idx >= 16)) | 179 | enable_irq_wake(port->irq); |
183 | enable_irq_wake(port->irq_high); | 180 | else |
184 | else | 181 | disable_irq_wake(port->irq); |
185 | enable_irq_wake(port->irq); | ||
186 | } else { | ||
187 | if (port->irq_high && (gpio_idx >= 16)) | ||
188 | disable_irq_wake(port->irq_high); | ||
189 | else | ||
190 | disable_irq_wake(port->irq); | ||
191 | } | ||
192 | 182 | ||
193 | return 0; | 183 | return 0; |
194 | } | 184 | } |