diff options
-rw-r--r-- | drivers/regulator/max77802.c | 1 | ||||
-rw-r--r-- | include/dt-bindings/regulator/maxim,max77802.h | 18 | ||||
-rw-r--r-- | include/linux/mfd/max77686.h | 7 |
3 files changed, 19 insertions, 7 deletions
diff --git a/drivers/regulator/max77802.c b/drivers/regulator/max77802.c index 3abf99dbf953..5839c4509e1f 100644 --- a/drivers/regulator/max77802.c +++ b/drivers/regulator/max77802.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/regulator/of_regulator.h> | 33 | #include <linux/regulator/of_regulator.h> |
34 | #include <linux/mfd/max77686.h> | 34 | #include <linux/mfd/max77686.h> |
35 | #include <linux/mfd/max77686-private.h> | 35 | #include <linux/mfd/max77686-private.h> |
36 | #include <dt-bindings/regulator/maxim,max77802.h> | ||
36 | 37 | ||
37 | /* Default ramp delay in case it is not manually set */ | 38 | /* Default ramp delay in case it is not manually set */ |
38 | #define MAX77802_RAMP_DELAY 100000 /* uV/us */ | 39 | #define MAX77802_RAMP_DELAY 100000 /* uV/us */ |
diff --git a/include/dt-bindings/regulator/maxim,max77802.h b/include/dt-bindings/regulator/maxim,max77802.h new file mode 100644 index 000000000000..cf28631d7109 --- /dev/null +++ b/include/dt-bindings/regulator/maxim,max77802.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2014 Google, Inc | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * Device Tree binding constants for the Maxim 77802 PMIC regulators | ||
9 | */ | ||
10 | |||
11 | #ifndef _DT_BINDINGS_REGULATOR_MAXIM_MAX77802_H | ||
12 | #define _DT_BINDINGS_REGULATOR_MAXIM_MAX77802_H | ||
13 | |||
14 | /* Regulator operating modes */ | ||
15 | #define MAX77802_OPMODE_LP 1 | ||
16 | #define MAX77802_OPMODE_NORMAL 3 | ||
17 | |||
18 | #endif /* _DT_BINDINGS_REGULATOR_MAXIM_MAX77802_H */ | ||
diff --git a/include/linux/mfd/max77686.h b/include/linux/mfd/max77686.h index 7e6dc4b2b795..553f7d09258a 100644 --- a/include/linux/mfd/max77686.h +++ b/include/linux/mfd/max77686.h | |||
@@ -131,13 +131,6 @@ enum max77686_opmode { | |||
131 | MAX77686_OPMODE_STANDBY, | 131 | MAX77686_OPMODE_STANDBY, |
132 | }; | 132 | }; |
133 | 133 | ||
134 | enum max77802_opmode { | ||
135 | MAX77802_OPMODE_OFF, | ||
136 | MAX77802_OPMODE_STANDBY, | ||
137 | MAX77802_OPMODE_LP, | ||
138 | MAX77802_OPMODE_NORMAL, | ||
139 | }; | ||
140 | |||
141 | struct max77686_opmode_data { | 134 | struct max77686_opmode_data { |
142 | int id; | 135 | int id; |
143 | int mode; | 136 | int mode; |