From: Mark Brown <broonie@linaro.org>
Date: Tue, 24 Jun 2014 11:20:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas
X-Git-Tag: v4.14-rc1~7099^2~3^6~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c0c9cabcb30d9d3104d2482536a0f60376085f6;p=platform%2Fkernel%2Flinux-rpi.git

Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas

Conflicts:
	drivers/regulator/palmas-regulator.c
---

4c0c9cabcb30d9d3104d2482536a0f60376085f6
diff --cc drivers/regulator/palmas-regulator.c
index 8fa651e,3277888..7c8b441
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@@ -465,7 -322,11 +465,11 @@@ static int palmas_set_mode_smps(struct 
  	pmic->current_reg_mode[id] = reg & PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
  	if (rail_enable)
  		palmas_smps_write(pmic->palmas,
 -			palmas_regs_info[id].ctrl_addr, reg);
 +				  ddata->palmas_regs_info[id].ctrl_addr, reg);
+ 
+ 	/* Switch the enable value to ensure this is used for enable */
+ 	pmic->desc[id].enable_val = pmic->current_reg_mode[id];
+ 
  	return 0;
  }