Browse Source

Merge remote-tracking branch 'regulator/topic/tps62360' into v3.9-rc8

Mark Brown 12 years ago
parent
commit
22a712b90c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/regulator/tps62360-regulator.c

+ 1 - 1
drivers/regulator/tps62360-regulator.c

@@ -278,7 +278,7 @@ static int tps62360_init_dcdc(struct tps62360_chip *tps,
 			__func__, REG_RAMPCTRL, ret);
 		return ret;
 	}
-	ramp_ctrl = (ramp_ctrl >> 4) & 0x7;
+	ramp_ctrl = (ramp_ctrl >> 5) & 0x7;
 
 	/* ramp mV/us = 32/(2^ramp_ctrl) */
 	tps->desc.ramp_delay = DIV_ROUND_UP(32000, BIT(ramp_ctrl));