summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJonghwa Lee <jonghwa3.lee@samsung.com>2014-02-03 17:29:25 +0900
committerChanho Park <chanho61.park@samsung.com>2014-03-20 17:43:37 +0900
commitd9ffb5b2c63abe0ad52715e8572e92e031928c6e (patch)
tree160454824cb171332ec05d750f70a97cc1caf91f /arch/arm
parentf14d1ea85296a05ac22a724c4fb6ebc358ffabd0 (diff)
downloadlinux-3.10-d9ffb5b2c63abe0ad52715e8572e92e031928c6e.tar.gz
linux-3.10-d9ffb5b2c63abe0ad52715e8572e92e031928c6e.tar.bz2
linux-3.10-d9ffb5b2c63abe0ad52715e8572e92e031928c6e.zip
Revert "WORKAROUND: Temporary workaround for Suspend-To-Ram."
This reverts commit 682061cb597d5174de6fee211a2ad565c33680f7. Change-Id: I4ac3f3b86ecd6a8b15ea2d266ab84b16aeb69dda Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/exynos4412-slp_pq.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4412-slp_pq.dts b/arch/arm/boot/dts/exynos4412-slp_pq.dts
index 0867adaf604..9f268f417eb 100644
--- a/arch/arm/boot/dts/exynos4412-slp_pq.dts
+++ b/arch/arm/boot/dts/exynos4412-slp_pq.dts
@@ -806,7 +806,7 @@
regulator-max-microvolt = <1500000>;
regulator-always-on;
regulator-boot-on;
- regulator-mem-on;
+ regulator-mem-off;
};
buck3_reg: buck@3 {