From c42d2750de62840561d33f484290c879b8a8e220 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Thu, 5 Apr 2012 18:09:40 +0800 Subject: [PATCH] rk30:sdk:modify sleep voltage --- arch/arm/mach-rk30/board-rk30-sdk-wm8326.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c index 4d808513a6c1..aeb7d83a4d13 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c +++ b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c @@ -172,9 +172,14 @@ int wm831x_post_init(struct wm831x *Wm831x) udelay(100); dcdc = regulator_get(NULL, "vdd_core"); // vdd_log +<<<<<<< Updated upstream <<<<<<< Updated upstream regulator_set_voltage(dcdc, 1150000, 1150000); regulator_set_suspend_voltage(dcdc, 1100000); +======= + regulator_set_voltage(dcdc, 1100000, 1100000); + regulator_set_suspend_voltage(dcdc, 1000000); +>>>>>>> Stashed changes ======= regulator_set_voltage(dcdc, 1100000, 1100000); regulator_set_suspend_voltage(dcdc, 1000000); -- 2.34.1