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>

3 files changed, 13 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 = {
diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
index 3e52b7f3d9cb..a6d4a71ea4af 100644
--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -42,6 +42,8 @@ static struct omap_gpio_reg_offs omap16xx_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 omap16xx_mpu_gpio_config = {
@@ -82,6 +84,9 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = {
         .datain         = OMAP1610_GPIO_DATAIN,
         .dataout        = OMAP1610_GPIO_DATAOUT,
         .irqstatus      = OMAP1610_GPIO_IRQSTATUS1,
+        .irqenable      = OMAP1610_GPIO_IRQENABLE1,
+        .set_irqenable  = OMAP1610_GPIO_SET_IRQENABLE1,
+        .clr_irqenable  = OMAP1610_GPIO_CLEAR_IRQENABLE1,
 };
 
 static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = {
diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c
index 35e8b31688d0..12bcd9f2864a 100644
--- a/arch/arm/mach-omap1/gpio7xx.c
+++ b/arch/arm/mach-omap1/gpio7xx.c
@@ -44,6 +44,8 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = {
         .datain         = OMAP_MPUIO_INPUT_LATCH / 2,
         .dataout        = OMAP_MPUIO_OUTPUT / 2,
         .irqstatus      = OMAP_MPUIO_GPIO_INT / 2,
+        .irqenable      = OMAP_MPUIO_GPIO_MASKIT / 2,
+        .irqenable_inv  = true,
 };
 
 static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {
@@ -82,6 +84,8 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = {
         .datain         = OMAP7XX_GPIO_DATA_INPUT,
         .dataout        = OMAP7XX_GPIO_DATA_OUTPUT,
         .irqstatus      = OMAP7XX_GPIO_INT_STATUS,
+        .irqenable      = OMAP7XX_GPIO_INT_MASK,
+        .irqenable_inv  = true,
 };
 
 static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {