aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
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 /drivers/gpio
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 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-omap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index c89c38869c0c..2c70617e6b45 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1286,14 +1286,14 @@ static int omap_gpio_runtime_resume(struct device *dev)
1286 old0 = __raw_readl(bank->base + bank->regs->leveldetect0); 1286 old0 = __raw_readl(bank->base + bank->regs->leveldetect0);
1287 old1 = __raw_readl(bank->base + bank->regs->leveldetect1); 1287 old1 = __raw_readl(bank->base + bank->regs->leveldetect1);
1288 1288
1289 if (cpu_is_omap24xx() || cpu_is_omap34xx()) { 1289 if (!bank->regs->irqstatus_raw0) {
1290 __raw_writel(old0 | gen, bank->base + 1290 __raw_writel(old0 | gen, bank->base +
1291 bank->regs->leveldetect0); 1291 bank->regs->leveldetect0);
1292 __raw_writel(old1 | gen, bank->base + 1292 __raw_writel(old1 | gen, bank->base +
1293 bank->regs->leveldetect1); 1293 bank->regs->leveldetect1);
1294 } 1294 }
1295 1295
1296 if (cpu_is_omap44xx()) { 1296 if (bank->regs->irqstatus_raw0) {
1297 __raw_writel(old0 | l, bank->base + 1297 __raw_writel(old0 | l, bank->base +
1298 bank->regs->leveldetect0); 1298 bank->regs->leveldetect0);
1299 __raw_writel(old1 | l, bank->base + 1299 __raw_writel(old1 | l, bank->base +