aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-06-12 23:27:11 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-13 13:57:56 -0400
commitb4bc9ef6253578ecc71eec79a7dd423d0a282a4b (patch)
treea26368efc8089f05e847c75e371a04a3c0e4158f /include/linux/mfd
parent74e20e569158063970624e360c8395ac5cffd654 (diff)
regulator: tps65217: Convert to regulator_[is_enabled|get_voltage_sel]_regmap
This patch converts .is_enabled and .get_voltage_sel to regulator_is_enabled_regmap and regulator_get_voltage_sel_regmap. For .enable, .disable, and .set_voltage_sel, the write protect level is either 1 or 2. So we cannot use regulator_[enable|disable|set_voltage_sel]_regmap. Now we store the enable reg/mask and vsel reg/mask in regulator_desc, so we can remove enable_mask, set_vout_reg, and set_vout_mask from struct tps_info. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/tps65217.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h
index e030ef9a64ee..4e035a41a9b0 100644
--- a/include/linux/mfd/tps65217.h
+++ b/include/linux/mfd/tps65217.h
@@ -229,9 +229,6 @@ struct tps65217_board {
229 * @uv_to_vsel: Function pointer to get selector from voltage 229 * @uv_to_vsel: Function pointer to get selector from voltage
230 * @table: Table for non-uniform voltage step-size 230 * @table: Table for non-uniform voltage step-size
231 * @table_len: Length of the voltage table 231 * @table_len: Length of the voltage table
232 * @enable_mask: Regulator enable mask bits
233 * @set_vout_reg: Regulator output voltage set register
234 * @set_vout_mask: Regulator output voltage set mask
235 * 232 *
236 * This data is used to check the regualtor voltage limits while setting. 233 * This data is used to check the regualtor voltage limits while setting.
237 */ 234 */
@@ -243,9 +240,6 @@ struct tps_info {
243 int (*uv_to_vsel)(int uV, unsigned int *vsel); 240 int (*uv_to_vsel)(int uV, unsigned int *vsel);
244 const int *table; 241 const int *table;
245 unsigned int table_len; 242 unsigned int table_len;
246 unsigned int enable_mask;
247 unsigned int set_vout_reg;
248 unsigned int set_vout_mask;
249}; 243};
250 244
251/** 245/**