diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mfd/samsung/core.h | 3 | ||||
-rw-r--r-- | include/linux/mfd/samsung/s5m8767.h | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index 900bc9e1888b..157e32b6ca28 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h | |||
@@ -126,7 +126,8 @@ struct sec_platform_data { | |||
126 | struct sec_regulator_data { | 126 | struct sec_regulator_data { |
127 | int id; | 127 | int id; |
128 | struct regulator_init_data *initdata; | 128 | struct regulator_init_data *initdata; |
129 | struct device_node *reg_node; | 129 | struct device_node *reg_node; |
130 | int ext_control_gpio; | ||
130 | }; | 131 | }; |
131 | 132 | ||
132 | /* | 133 | /* |
diff --git a/include/linux/mfd/samsung/s5m8767.h b/include/linux/mfd/samsung/s5m8767.h index 2ab0b0f03641..243b58fec33d 100644 --- a/include/linux/mfd/samsung/s5m8767.h +++ b/include/linux/mfd/samsung/s5m8767.h | |||
@@ -183,10 +183,17 @@ enum s5m8767_regulators { | |||
183 | S5M8767_REG_MAX, | 183 | S5M8767_REG_MAX, |
184 | }; | 184 | }; |
185 | 185 | ||
186 | /* LDO_EN/BUCK_EN field in registers */ | ||
186 | #define S5M8767_ENCTRL_SHIFT 6 | 187 | #define S5M8767_ENCTRL_SHIFT 6 |
187 | #define S5M8767_ENCTRL_MASK (0x3 << S5M8767_ENCTRL_SHIFT) | 188 | #define S5M8767_ENCTRL_MASK (0x3 << S5M8767_ENCTRL_SHIFT) |
188 | 189 | ||
189 | /* | 190 | /* |
191 | * LDO_EN/BUCK_EN register value for controlling this Buck or LDO | ||
192 | * by GPIO (PWREN, BUCKEN). | ||
193 | */ | ||
194 | #define S5M8767_ENCTRL_USE_GPIO 0x1 | ||
195 | |||
196 | /* | ||
190 | * Values for BUCK_RAMP field in DVS_RAMP register, matching raw values | 197 | * Values for BUCK_RAMP field in DVS_RAMP register, matching raw values |
191 | * in mV/us. | 198 | * in mV/us. |
192 | */ | 199 | */ |