From: Robin Gong Date: Wed, 31 Oct 2012 13:41:16 +0000 (+0800) Subject: ENGR00231910 PU regulator: do not disable PU regulator X-Git-Tag: v3.0.35-fsl_4.1.0~463 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb9724f6c16737051a5fe885d105e3c8530b6cd8;p=karo-tx-linux.git 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 --- 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. */