summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/gpio15xx.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-04-21 09:53:06 -0700
committerKevin Hilman <khilman@ti.com>2011-06-16 11:13:51 -0700
commit28f3b5a073b6dbafbb78cae65b22ea90547d7a87 (patch)
tree7e4f1ce8067c39d50c84081a26dec08143edff8c /arch/arm/mach-omap1/gpio15xx.c
parenteef4bec7bf2fa9953f6b8f371d5914d014f45d40 (diff)
downloadlinux-stable-28f3b5a073b6dbafbb78cae65b22ea90547d7a87.tar.gz
linux-stable-28f3b5a073b6dbafbb78cae65b22ea90547d7a87.tar.bz2
linux-stable-28f3b5a073b6dbafbb78cae65b22ea90547d7a87.zip
gpio/omap: conslidate enable/disable of GPIO IRQs, remove ifdefs
Cleanup GPIO IRQ enable/disable handling by removing SoC-specific Also split enable/disable IRQ into separate functions for better readability and also facilitate potentially moving to generic irq_chip in the future. Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap1/gpio15xx.c')
-rw-r--r--arch/arm/mach-omap1/gpio15xx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
index 487a08749655..91756245e860 100644
--- a/arch/arm/mach-omap1/gpio15xx.c
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@ -39,6 +39,8 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = {
.datain = OMAP_MPUIO_INPUT_LATCH,
.dataout = OMAP_MPUIO_OUTPUT,
.irqstatus = OMAP_MPUIO_GPIO_INT,
+ .irqenable = OMAP_MPUIO_GPIO_MASKIT,
+ .irqenable_inv = true,
};
static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {
@@ -77,6 +79,8 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = {
.datain = OMAP1510_GPIO_DATA_INPUT,
.dataout = OMAP1510_GPIO_DATA_OUTPUT,
.irqstatus = OMAP1510_GPIO_INT_STATUS,
+ .irqenable = OMAP1510_GPIO_INT_MASK,
+ .irqenable_inv = true,
};
static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {