rk30:sdk:modify sleep voltage

This commit is contained in:
张晴
2012-04-05 18:19:51 +08:00
parent c42d2750de
commit 1d7c3be713

View File

@@ -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);