diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-07-24 14:13:12 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:33:26 -0700 |
| commit | 347278f4e03bc68fb60d091d4a0e36210a47e065 (patch) | |
| tree | 2f1440c0c9936ee681318718c98b437799b8224c /include/linux/mfd/max77660 | |
| parent | a6ed5bfd33957675348b3bab5f5b1ecfb8de1d61 (diff) | |
regulator: max77660: do not disable rail if external control
If any rail is selected for the external control then do not
disable the rail manually.
Also enable the always-on for externally controlled rail.
Enable the full regualtor constraint to disable the unused rails.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/245102
(cherry picked from commit 00f7dd682c3ef702e4228f375b586ab590533956)
Change-Id: Ie60bfec0ed077312fd5014cb25cc0a754cacfe35
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/252815
Diffstat (limited to 'include/linux/mfd/max77660')
| -rw-r--r-- | include/linux/mfd/max77660/max77660-core.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/mfd/max77660/max77660-core.h b/include/linux/mfd/max77660/max77660-core.h index 611e068a2867..e15dc8ba8f2b 100644 --- a/include/linux/mfd/max77660/max77660-core.h +++ b/include/linux/mfd/max77660/max77660-core.h @@ -945,11 +945,14 @@ enum max77660_regulator_fps_src { #define GLPM_ENABLE 0x80 /* EN enable */ -#define ENABLE_EN1 BIT(0) -#define ENABLE_EN2 BIT(1) -#define ENABLE_EN3 BIT(2) -#define ENABLE_EN (ENABLE_EN1 | ENABLE_EN2 | ENABLE_EN3) - +#define MAX77660_EXT_ENABLE_EN1 BIT(0) +#define MAX77660_EXT_ENABLE_EN2 BIT(1) +#define MAX77660_EXT_ENABLE_EN3 BIT(2) +#define MAX77660_EXT_ENABLE_EN4 BIT(3) +#define MAX77660_EXT_ENABLE_EN5 BIT(4) +#define MAX77660_EXTERNAL_ENABLE (MAX77660_EXT_ENABLE_EN1 | \ + MAX77660_EXT_ENABLE_EN2 | MAX77660_EXT_ENABLE_EN3 | \ + MAX77660_EXT_ENABLE_EN4 | MAX77660_EXT_ENABLE_EN5) /* Disable DVFS */ #define DISABLE_DVFS 0x10 |