From 5f6c76e09cf7d7f5fffca0efc01949626d6c6049 Mon Sep 17 00:00:00 2001 From: Tushar Behera Date: Tue, 21 Jun 2011 09:08:59 +0530 Subject: [PATCH] --- yaml --- r: 254755 b: refs/heads/master c: dbb48e7c3db4871803fc990864e37917e413ccb2 h: refs/heads/master i: 254753: 4aaaf94a5dfe920282c882a5c0febb8bb71cf08e 254751: 183b2ebc38c954b9f3221ee9a294113ac5a16396 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8997.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 228a083687da..a0b7fa0d4ea2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2cf3137aaa23faf2b8c1335671f1a0a0d90aab5 +refs/heads/master: dbb48e7c3db4871803fc990864e37917e413ccb2 diff --git a/trunk/drivers/regulator/max8997.c b/trunk/drivers/regulator/max8997.c index 10d5a1d9768e..0fc7b8c720d2 100644 --- a/trunk/drivers/regulator/max8997.c +++ b/trunk/drivers/regulator/max8997.c @@ -1124,6 +1124,10 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev) 0x3f); } + /* Misc Settings */ + max8997->ramp_delay = 10; /* set 10mV/us, which is the default */ + max8997_write_reg(i2c, MAX8997_REG_BUCKRAMP, (0xf << 4) | 0x9); + for (i = 0; i < pdata->num_regulators; i++) { const struct voltage_map_desc *desc; int id = pdata->regulators[i].id; @@ -1148,10 +1152,6 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev) } } - /* Misc Settings */ - max8997->ramp_delay = 10; /* set 10mV/us, which is the default */ - max8997_write_reg(i2c, MAX8997_REG_BUCKRAMP, (0xf << 4) | 0x9); - return 0; err: for (i = 0; i < max8997->num_regulators; i++)