diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:45 +0100 |
| commit | ae5f5203e5ea2a50e90bdd3a6f2a2a2d0b2d56d5 (patch) | |
| tree | 5a94af168769f0c100df2b08c07f7599b7e7bfa6 /include/linux/mfd/palmas.h | |
| parent | 75f01f949902db68b7937dfbae71b0b46a398161 (diff) | |
| parent | 0ea34b578647e60ad4e06c9ba29829dc07c5264a (diff) | |
| download | lwn-ae5f5203e5ea2a50e90bdd3a6f2a2a2d0b2d56d5.tar.gz lwn-ae5f5203e5ea2a50e90bdd3a6f2a2a2d0b2d56d5.zip | |
Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8
Diffstat (limited to 'include/linux/mfd/palmas.h')
| -rw-r--r-- | include/linux/mfd/palmas.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 3bbda22721ea..ecddc5173c7c 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -109,19 +109,6 @@ struct palmas_reg_init { */ int mode_sleep; - /* tstep is the timestep loaded to the TSTEP register - * - * For SMPS - * - * 0: Jump (no slope control) - * 1: 10mV/us - * 2: 5mV/us - * 3: 2.5mV/us - * - * For LDO unused - */ - int tstep; - /* voltage_sel is the bitfield loaded onto the SMPSX_VOLTAGE * register. Set this is the default voltage set in OTP needs * to be overridden. @@ -154,6 +141,12 @@ enum palmas_regulators { PALMAS_REG_LDO9, PALMAS_REG_LDOLN, PALMAS_REG_LDOUSB, + /* External regulators */ + PALMAS_REG_REGEN1, + PALMAS_REG_REGEN2, + PALMAS_REG_REGEN3, + PALMAS_REG_SYSEN1, + PALMAS_REG_SYSEN2, /* Total number of regulators */ PALMAS_NUM_REGS, }; @@ -171,6 +164,9 @@ struct palmas_pmic_platform_data { /* use LDO6 for vibrator control */ int ldo6_vibrator; + + /* Enable tracking mode of LDO8 */ + bool enable_ldo8_tracking; }; struct palmas_usb_platform_data { @@ -331,6 +327,8 @@ struct palmas_pmic { int smps457; int range[PALMAS_REG_SMPS10]; + unsigned int ramp_delay[PALMAS_REG_SMPS10]; + unsigned int current_reg_mode[PALMAS_REG_SMPS10]; }; struct palmas_resource { |