summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorShubhrajyoti D <shubhrajyoti@ti.com>2012-11-05 17:53:42 +0530
committerWolfram Sang <w.sang@pengutronix.de>2012-11-14 17:44:42 +0100
commit554c96744afd169886bd6fc2736fb0d9aaf634e8 (patch)
tree3185c3af4da7d68d12843a324eab09d01fbad0af /drivers/i2c
parentd6c842ad564c336d62d3d5777c520454f1473b8c (diff)
downloadlinux-554c96744afd169886bd6fc2736fb0d9aaf634e8.tar.gz
linux-554c96744afd169886bd6fc2736fb0d9aaf634e8.tar.bz2
linux-554c96744afd169886bd6fc2736fb0d9aaf634e8.zip
i2c: omap: Restore i2c context always
Currently the restore is done based on the flag OMAP_I2C_FLAG_RESET_REGS_POSTIDLE. This helps the following - The driver is always capable of restoring regardless of the off mode support being there or not. - While testing omap2430 it is found that in case of certain error paths (timeout) a reset is done. However the restore never happens as it is dependent on the POSTIDLE flag. The other option would be to call a restore in the reset case. As there are only a few registers to be restored the penalty in the idle case should not be much. Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index faaa05224904..067a73922be3 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1327,8 +1327,7 @@ static int omap_i2c_runtime_resume(struct device *dev)
if (!_dev->regs)
return 0;
- if (_dev->flags & OMAP_I2C_FLAG_RESET_REGS_POSTIDLE)
- __omap_i2c_init(_dev);
+ __omap_i2c_init(_dev);
return 0;
}