summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 12:50:17 (GMT)
committerMark Brown <broonie@linaro.org>2013-09-01 12:50:17 (GMT)
commit39fe3b45d3951c3633ddb7aafb29ceef3f012761 (patch)
tree5f5c10873cef3dde53d3bbd172151c020b4b8469 /include
parentf27a5fb424d4897edd3c7735ecf054ee57a5dbd0 (diff)
parent0416ea1359b3f0a8755947f46f336608793a9649 (diff)
downloadlinux-39fe3b45d3951c3633ddb7aafb29ceef3f012761.tar.xz
Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/palmas.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 1a8dd7a..c06d78a 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -160,7 +160,8 @@ enum palmas_regulators {
PALMAS_REG_SMPS7,
PALMAS_REG_SMPS8,
PALMAS_REG_SMPS9,
- PALMAS_REG_SMPS10,
+ PALMAS_REG_SMPS10_OUT2,
+ PALMAS_REG_SMPS10_OUT1,
/* LDO regulators */
PALMAS_REG_LDO1,
PALMAS_REG_LDO2,
@@ -355,9 +356,9 @@ struct palmas_pmic {
int smps123;
int smps457;
- int range[PALMAS_REG_SMPS10];
- unsigned int ramp_delay[PALMAS_REG_SMPS10];
- unsigned int current_reg_mode[PALMAS_REG_SMPS10];
+ int range[PALMAS_REG_SMPS10_OUT1];
+ unsigned int ramp_delay[PALMAS_REG_SMPS10_OUT1];
+ unsigned int current_reg_mode[PALMAS_REG_SMPS10_OUT1];
};
struct palmas_resource {