summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimone Willett <swillett@nvidia.com>2012-07-31 16:32:09 -0700
committerSimone Willett <swillett@nvidia.com>2012-08-01 19:19:08 -0700
commit54c710020c117465058e12a77b66257177bc328c (patch)
tree642794faecc33b10a19ee2ee228b345db86f3f18 /include
parent8831e498fcd1b1da461bdba2da04d89b06e960a9 (diff)
Revert "Revert "regulator: tps80031: rename regulator-name enums""
This reverts commit 70e40e9cf025c73fde46d1a5577547dc37182a64 Change-Id: Iaf390c0d3ea16686f619f321bceea572ee7434fc Reviewed-on: http://git-master/r/119802 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/tps80031-regulator.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/include/linux/regulator/tps80031-regulator.h b/include/linux/regulator/tps80031-regulator.h
index 4dfdf7950918..1609eeee6763 100644
--- a/include/linux/regulator/tps80031-regulator.h
+++ b/include/linux/regulator/tps80031-regulator.h
@@ -29,23 +29,23 @@
#define tps80031_rails(_name) "tps80031_"#_name
enum {
- TPS80031_ID_VIO,
- TPS80031_ID_SMPS1,
- TPS80031_ID_SMPS2,
- TPS80031_ID_SMPS3,
- TPS80031_ID_SMPS4,
- TPS80031_ID_VANA,
- TPS80031_ID_LDO1,
- TPS80031_ID_LDO2,
- TPS80031_ID_LDO3,
- TPS80031_ID_LDO4,
- TPS80031_ID_LDO5,
- TPS80031_ID_LDO6,
- TPS80031_ID_LDO7,
- TPS80031_ID_LDOLN,
- TPS80031_ID_LDOUSB,
- TPS80031_ID_VBUS,
- TPS80031_ID_CHARGER,
+ TPS80031_REGULATOR_VIO,
+ TPS80031_REGULATOR_SMPS1,
+ TPS80031_REGULATOR_SMPS2,
+ TPS80031_REGULATOR_SMPS3,
+ TPS80031_REGULATOR_SMPS4,
+ TPS80031_REGULATOR_VANA,
+ TPS80031_REGULATOR_LDO1,
+ TPS80031_REGULATOR_LDO2,
+ TPS80031_REGULATOR_LDO3,
+ TPS80031_REGULATOR_LDO4,
+ TPS80031_REGULATOR_LDO5,
+ TPS80031_REGULATOR_LDO6,
+ TPS80031_REGULATOR_LDO7,
+ TPS80031_REGULATOR_LDOLN,
+ TPS80031_REGULATOR_LDOUSB,
+ TPS80031_REGULATOR_VBUS,
+ TPS80031_REGULATOR_CHARGER,
};