rk30:sdk:modify sleep voltage

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
index 4d808513a6c17ee79bd9984f114c7753291930d4..aeb7d83a4d13777eb911b1555fda116f260ad3c1 100755 (executable)
--- 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);