diff options
author | Kevin Hilman <khilman@ti.com> | 2011-04-21 12:17:35 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-06-16 14:13:46 -0400 |
commit | eef4bec7bf2fa9953f6b8f371d5914d014f45d40 (patch) | |
tree | 9c81437aca15d8d5f4caed2e23d1072877c1e13c /arch/arm/mach-omap2/gpio.c | |
parent | fa87931acb8203a1f40a3c637863ad238f70cd40 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-omap2/gpio.c')
-rw-r--r-- | arch/arm/mach-omap2/gpio.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) | |||
76 | pdata->regs->dataout = OMAP24XX_GPIO_DATAOUT; | 76 | pdata->regs->dataout = OMAP24XX_GPIO_DATAOUT; |
77 | pdata->regs->set_dataout = OMAP24XX_GPIO_SETDATAOUT; | 77 | pdata->regs->set_dataout = OMAP24XX_GPIO_SETDATAOUT; |
78 | pdata->regs->clr_dataout = OMAP24XX_GPIO_CLEARDATAOUT; | 78 | pdata->regs->clr_dataout = OMAP24XX_GPIO_CLEARDATAOUT; |
79 | pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1; | ||
80 | pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2; | ||
79 | break; | 81 | break; |
80 | case 2: | 82 | case 2: |
81 | pdata->bank_type = METHOD_GPIO_44XX; | 83 | pdata->bank_type = METHOD_GPIO_44XX; |
@@ -84,6 +86,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) | |||
84 | pdata->regs->dataout = OMAP4_GPIO_DATAOUT; | 86 | pdata->regs->dataout = OMAP4_GPIO_DATAOUT; |
85 | pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT; | 87 | pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT; |
86 | pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT; | 88 | pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT; |
89 | pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0; | ||
90 | pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1; | ||
87 | break; | 91 | break; |
88 | default: | 92 | default: |
89 | WARN(1, "Invalid gpio bank_type\n"); | 93 | WARN(1, "Invalid gpio bank_type\n"); |