gpio/omap: consolidate IRQ status handling, remove #ifdefs

Cleanup IRQ status handling by passing IRQ status register offsets
via platform data.

Cleans up clearing of GPIO IRQ status and GPIO ISR handler.

Signed-off-by: Kevin Hilman <khilman@ti.com>

5 files changed, 12 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
index a622d567b53e..487a08749655 100644
--- a/arch/arm/mach-omap1/gpio15xx.c
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@ -38,6 +38,7 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = {
         .direction      = OMAP_MPUIO_IO_CNTL,
         .datain         = OMAP_MPUIO_INPUT_LATCH,
         .dataout        = OMAP_MPUIO_OUTPUT,
+        .irqstatus      = OMAP_MPUIO_GPIO_INT,
 };
 
 static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {
@@ -75,6 +76,7 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = {
         .direction      = OMAP1510_GPIO_DIR_CONTROL,
         .datain         = OMAP1510_GPIO_DATA_INPUT,
         .dataout        = OMAP1510_GPIO_DATA_OUTPUT,
+        .irqstatus      = OMAP1510_GPIO_INT_STATUS,
 };
 
 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 4ff6ff36ab73..3e52b7f3d9cb 100644
--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -41,6 +41,7 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = {
         .direction      = OMAP_MPUIO_IO_CNTL,
         .datain         = OMAP_MPUIO_INPUT_LATCH,
         .dataout        = OMAP_MPUIO_OUTPUT,
+        .irqstatus      = OMAP_MPUIO_GPIO_INT,
 };
 
 static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = {
@@ -80,6 +81,7 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = {
         .clr_dataout    = OMAP1610_GPIO_CLEAR_DATAOUT,
         .datain         = OMAP1610_GPIO_DATAIN,
         .dataout        = OMAP1610_GPIO_DATAOUT,
+        .irqstatus      = OMAP1610_GPIO_IRQSTATUS1,
 };
 
 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 efe4dccaa4f2..35e8b31688d0 100644
--- a/arch/arm/mach-omap1/gpio7xx.c
+++ b/arch/arm/mach-omap1/gpio7xx.c
@@ -43,6 +43,7 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = {
         .direction      = OMAP_MPUIO_IO_CNTL / 2,
         .datain         = OMAP_MPUIO_INPUT_LATCH / 2,
         .dataout        = OMAP_MPUIO_OUTPUT / 2,
+        .irqstatus      = OMAP_MPUIO_GPIO_INT / 2,
 };
 
 static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {
@@ -80,6 +81,7 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = {
         .direction      = OMAP7XX_GPIO_DIR_CONTROL,
         .datain         = OMAP7XX_GPIO_DATA_INPUT,
         .dataout        = OMAP7XX_GPIO_DATA_OUTPUT,
+        .irqstatus      = OMAP7XX_GPIO_INT_STATUS,
 };
 
 static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index 357e06956b0c..7c5e67d0b635 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -76,6 +76,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
                 pdata->regs->dataout = OMAP24XX_GPIO_DATAOUT;
                 pdata->regs->set_dataout = OMAP24XX_GPIO_SETDATAOUT;
                 pdata->regs->clr_dataout = OMAP24XX_GPIO_CLEARDATAOUT;
+                pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1;
+                pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2;
                 break;
         case 2:
                 pdata->bank_type = METHOD_GPIO_44XX;
@@ -84,6 +86,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
                 pdata->regs->dataout = OMAP4_GPIO_DATAOUT;
                 pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT;
                 pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT;
+                pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0;
+                pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;
                 break;
         default:
                 WARN(1, "Invalid gpio bank_type\n");
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index 268bccd0f7f6..aedd732ef464 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -180,6 +180,8 @@ struct omap_gpio_reg_offs {
         u16 dataout;
         u16 set_dataout;
         u16 clr_dataout;
+        u16 irqstatus;
+        u16 irqstatus2;
 };
 
 struct omap_gpio_platform_data {