shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

Browse Source
This commit is contained in:
蔡枫
2011-07-01 16:20:29 +08:00
parent 9a34394314 bffa62f342
commit e52fc9939b
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
arch/arm/mach-rk29/board-rk29-phonesdk.c
View File

@@ -777,13 +777,6 @@ int wm831x_post_init(struct wm831x *parm)
printk("%s set ldo2=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_put(ldo);
ldo = regulator_get(NULL, "ldo3"); //sram
regulator_disable(ldo);
// regulator_set_voltage(ldo,1800000,1800000);
// regulator_set_suspend_voltage(ldo,1800000);
// regulator_enable(ldo);
// printk("%s set ldo3=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_put(ldo);
ldo = regulator_get(NULL, "ldo5"); //tf
regulator_set_voltage(ldo,3000000,3000000);
@@ -799,22 +792,32 @@ int wm831x_post_init(struct wm831x *parm)
printk("%s set ldo6=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_put(ldo);
#if 0
ldo = regulator_get(NULL, "ldo3"); //sram
regulator_set_voltage(ldo,1800000,1800000);
regulator_set_suspend_voltage(ldo,1800000);
regulator_enable(ldo);
printk("%s set ldo3=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_put(ldo);
ldo = regulator_get(NULL, "ldo8"); //cmmb
regulator_disable(ldo);
// regulator_set_voltage(ldo,1200000,1200000);
// regulator_set_suspend_voltage(ldo,1200000);
// regulator_enable(ldo);
// printk("%s set ldo8=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_set_voltage(ldo,1200000,1200000);
regulator_set_suspend_voltage(ldo,1200000);
regulator_enable(ldo);
printk("%s set ldo8=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_put(ldo);
ldo = regulator_get(NULL, "ldo9"); //cmmb
regulator_disable(ldo);
// regulator_set_voltage(ldo,3000000,3000000);
// regulator_set_suspend_voltage(ldo,3000000);
// regulator_enable(ldo);
// printk("%s set ldo9=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_set_voltage(ldo,3000000,3000000);
regulator_set_suspend_voltage(ldo,3000000);
regulator_enable(ldo);
printk("%s set ldo9=%dmV end\n", __FUNCTION__, regulator_get_voltage(ldo));
regulator_put(ldo);
#endif
#endif
ldo = regulator_get(NULL, "ldo11");