---

yaml --- r: 312583 b: refs/heads/master c: 1af142c h: refs/heads/master i: 312581: 3d67301 312579: 2166c02 312575: 899f2c1 v: v3
git-mirror · Jun 25, 2012 · 6c00014 · 6c00014
1 parent 226e0c1
commit 6c00014
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85e63343f49cdf859bb630ba39d9a9af85dfb3e6
+refs/heads/master: 1af142c6f9843952d8eaff1c3de40d0b5d16f3ed
diff --git a/trunk/drivers/regulator/s5m8767.c b/trunk/drivers/regulator/s5m8767.c
@@ -720,9 +720,13 @@ static __devinit int s5m8767_pmic_probe(struct platform_device *pdev)
 	if (s5m8767->buck2_ramp || s5m8767->buck3_ramp
 		|| s5m8767->buck4_ramp) {
 		switch (s5m8767->ramp_delay) {
-		case 15:
+		case 5:
 			s5m_reg_update(s5m8767->iodev, S5M8767_REG_DVSRAMP,
-					0xc0, 0xf0);
+					0x40, 0xf0);
+			break;
+		case 10:
+			s5m_reg_update(s5m8767->iodev, S5M8767_REG_DVSRAMP,
+					0x90, 0xf0);
 			break;
 		case 25:
 			s5m_reg_update(s5m8767->iodev, S5M8767_REG_DVSRAMP,