summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vc44xx_data.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-05-04 08:54:41 -0700
committerSasha Levin <sasha.levin@oracle.com>2015-06-09 13:43:30 -0400
commit7b022b8ad207d2d0ce8aa8a16d22a424a417f28d (patch)
tree0e405967ce5f2484d945f0c3bd8a8d8be130946f /arch/arm/mach-omap2/vc44xx_data.c
parent0f0e4765c9f488fe1af9973be323cb2dd2326059 (diff)
downloadlinux-stable-7b022b8ad207d2d0ce8aa8a16d22a424a417f28d.tar.gz
linux-stable-7b022b8ad207d2d0ce8aa8a16d22a424a417f28d.tar.bz2
linux-stable-7b022b8ad207d2d0ce8aa8a16d22a424a417f28d.zip
ARM: OMAP2+: Fix omap off idle power consumption creeping up
[ Upstream commit 102bcb6ed2d1c3ffcc7269afc957c2df11942085 ] If we use a combination of VMODE and I2C4 for retention modes, eventually the off idle power consumption will creep up by about 23mW, even during off mode with I2C4 always staying enabled. Turns out this is because of erratum i531 "Extra Power Consumed When Repeated Start Operation Mode Is Enabled on I2C Interface Dedicated for Smart Reflex (I2C4)" as pointed out by Nishanth Menon <nm@ti.com>. Let's fix the issue by adding i2c_cfg_clear_mask for the bits to clear when initializing the I2C4 adapter so we can clear SREN bit that drives the I2C4 lines low otherwise when there is no traffic. Fixes: 3b8c4ebb7630 ("ARM: OMAP3: Fix idle mode signaling for Cc: stable@vger.kernel.org # v3.16+ sys_clkreq and sys_off_mode") Cc: Kevin Hilman <khilman@kernel.org> Cc: Tero Kristo <t-kristo@ti.com> Reviewed-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch/arm/mach-omap2/vc44xx_data.c')
-rw-r--r--arch/arm/mach-omap2/vc44xx_data.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c
index 085e5d6a04fd..2abd5fa8a697 100644
--- a/arch/arm/mach-omap2/vc44xx_data.c
+++ b/arch/arm/mach-omap2/vc44xx_data.c
@@ -42,6 +42,7 @@ static const struct omap_vc_common omap4_vc_common = {
.cmd_ret_shift = OMAP4430_RET_SHIFT,
.cmd_off_shift = OMAP4430_OFF_SHIFT,
.i2c_cfg_reg = OMAP4_PRM_VC_CFG_I2C_MODE_OFFSET,
+ .i2c_cfg_clear_mask = OMAP4430_SRMODEEN_MASK | OMAP4430_HSMODEEN_MASK,
.i2c_cfg_hsen_mask = OMAP4430_HSMODEEN_MASK,
.i2c_mcode_mask = OMAP4430_HSMCODE_MASK,
};