diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2011-07-14 15:31:49 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-07-15 16:41:59 -0700 |
| commit | 1b11a0887f2c0eed265f07e143688cf59262309f (patch) | |
| tree | e91aaa4501793ee5af2a54974d13427fa3fb2a54 /include | |
| parent | bbbff29927ab62f3be5fccea76889cdcb5510420 (diff) | |
mfd: tps80031: Move rail definition to regulator header
Moving the definitions of regulator rail names into regulator
header from core header.
bug 849977
Change-Id: Ia2e4e9394b6ee013e2e12355038e15609d5077ea
Reviewed-on: http://git-master/r/41023
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/tps80031.h | 21 | ||||
| -rw-r--r-- | include/linux/regulator/tps80031-regulator.h | 24 |
2 files changed, 23 insertions, 22 deletions
diff --git a/include/linux/mfd/tps80031.h b/include/linux/mfd/tps80031.h index 120a77aca899..e62cfb30e988 100644 --- a/include/linux/mfd/tps80031.h +++ b/include/linux/mfd/tps80031.h @@ -32,27 +32,6 @@ enum chips { TPS80032 = 0x00000002, }; -#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, -}; - enum { TPS80031_INT_PWRON, TPS80031_INT_RPWRON, diff --git a/include/linux/regulator/tps80031-regulator.h b/include/linux/regulator/tps80031-regulator.h index 92787df097ce..fe4e0a553104 100644 --- a/include/linux/regulator/tps80031-regulator.h +++ b/include/linux/regulator/tps80031-regulator.h @@ -26,6 +26,28 @@ #include <linux/regulator/machine.h> +#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, +}; + + enum { /* USBLDO input selection */ USBLDO_INPUT_VSYS = 0x00000001, @@ -52,7 +74,7 @@ enum { * @init_enable: Enable or do not enable the rails during initialization. * @init_apply: Init parameter applied or not. * @flags: Configuration flag to configure the rails. It should be ORed of - * above enums. + * above enums. */ struct tps80031_regulator_platform_data { |