From 1d7c3be71312b48ebacce0d97e1b33afd8a1dd14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Thu, 5 Apr 2012 18:19:51 +0800 Subject: [PATCH] rk30:sdk:modify sleep voltage --- arch/arm/mach-rk30/board-rk30-sdk-wm8326.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c index aeb7d83a4d13..0e23630749e1 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c +++ b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c @@ -172,18 +172,8 @@ 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); ->>>>>>> Stashed changes regulator_enable(dcdc); printk("%s set dcdc1 vdd_core(vdd_log)=%dmV end\n", __func__, regulator_get_voltage(dcdc)); regulator_put(dcdc); -- 2.34.1