From 6c00014435ff416c3025c65341d464d14b2de596 Mon Sep 17 00:00:00 2001 From: Sangbeom Kim Date: Wed, 13 Jun 2012 17:27:54 +0900 Subject: [PATCH] --- yaml --- r: 312583 b: refs/heads/master c: 1af142c6f9843952d8eaff1c3de40d0b5d16f3ed h: refs/heads/master i: 312581: 3d67301e8cc5577c954b750eb8aa7c448803681c 312579: 2166c02ddbf832b81d38c982e046f7a46ab411e3 312575: 899f2c176522ec8f7f1e916476ce1dfb45d83d70 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/s5m8767.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5ac001c47d53..dd49a3f33312 100644 --- 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 index 22642c3ccf76..533bde68e4b7 100644 --- 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,