aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTarun Kanti DebBarma <tarun.kanti@ti.com>2012-04-27 10:13:37 -0400
committerKevin Hilman <khilman@ti.com>2012-05-11 20:08:40 -0400
commit4e962e8998cc6cb5e58beae5feb6a65cb1a27f26 (patch)
tree391e73578b298613625b09d9691a62e31481e3b0 /arch
parent9c4ed9e6c01e7a8bd9079da8267e1f03cb4761fc (diff)
gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()
Add register offsets for GPIO_IRQSTATUS_RAW_0, GPIO_IRQSTATUS_RAW_0 which are present on OMAP4+ processors. Now we can distinguish conditions applicable to OMAP4,5 and those specific to OMAP24xx and OMAP3xxx. Cc: Kevin Hilman <khilman@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Cousson, Benoit <b-cousson@ti.com> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Govindraj.R <govindraj.raja@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/gpio.c2
-rw-r--r--arch/arm/plat-omap/include/plat/gpio.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index 86f91a6ed4e4..a144e22969a3 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -101,6 +101,8 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
101 pdata->regs->dataout = OMAP4_GPIO_DATAOUT; 101 pdata->regs->dataout = OMAP4_GPIO_DATAOUT;
102 pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT; 102 pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT;
103 pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT; 103 pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT;
104 pdata->regs->irqstatus_raw0 = OMAP4_GPIO_IRQSTATUSRAW0;
105 pdata->regs->irqstatus_raw1 = OMAP4_GPIO_IRQSTATUSRAW1;
104 pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0; 106 pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0;
105 pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1; 107 pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;
106 pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0; 108 pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0;
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index d903e7df3fb1..50fb7cc000ea 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -172,6 +172,8 @@ struct omap_gpio_reg_offs {
172 u16 clr_dataout; 172 u16 clr_dataout;
173 u16 irqstatus; 173 u16 irqstatus;
174 u16 irqstatus2; 174 u16 irqstatus2;
175 u16 irqstatus_raw0;
176 u16 irqstatus_raw1;
175 u16 irqenable; 177 u16 irqenable;
176 u16 irqenable2; 178 u16 irqenable2;
177 u16 set_irqenable; 179 u16 set_irqenable;