summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gong <b38343@freescale.com>2012-10-31 21:41:16 +0800
committerJason Liu <r64343@freescale.com>2012-10-31 23:05:39 +0800
commit577d0d5a8cc90a86a0421b593c4de5c3451bb02c (patch)
tree24283d365fe2475ceee61b718d104df40adf0f96
parentfd920e8556c6502d19898d6a5b5a05722cac7ff5 (diff)
ENGR00231910 PU regulator: do not disable PU regulator
If system enter suspend/resume during VPU encoding on Rigel, there will be "VPU blocking: timeout." error . But there is ok if enter suspend/resume during VPU decoding and enter suspend/resume during encoding/decoding on Arik, until now we didn't know the root cause, so revert it firstly. Because the previous patch about PU regulator is composed with four commits and hard to revert, now we adopt simplest way that do not disable PU regulator in low level. The negative impact is there will several mA increasment in suspend, we will fix it ASAP. Signed-off-by: Robin Gong <b38343@freescale.com>
-rw-r--r--arch/arm/mach-mx6/mx6_anatop_regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/mx6_anatop_regulator.c b/arch/arm/mach-mx6/mx6_anatop_regulator.c
index 9599a5439e54..1ed5183eaa6e 100644
--- a/arch/arm/mach-mx6/mx6_anatop_regulator.c
+++ b/arch/arm/mach-mx6/mx6_anatop_regulator.c
@@ -210,7 +210,7 @@ static int pu_disable(struct anatop_regulator *sreg)
{
unsigned int reg;
int ret = 0;
-
+ return 0;
/* Disable the brown out detection since we are going to be
* disabling the LDO.
*/