diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-08-23 15:15:27 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-08-23 15:15:29 -0700 |
| commit | ebdf93b2c71d29ec1c7c1d728d0d55f8045d565f (patch) | |
| tree | 1792e4fd3c1ca0b0ed2bc05be202ead128c34380 /include | |
| parent | 3535347550a76033a4ed75a279207338c456bdfd (diff) | |
| parent | aac14278d936b1287ca0f258367a1f5b1cfc453d (diff) | |
Merge branch 'linux-tegra-nv-2.6.39' into android-tegra-nv-2.6.39
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/tps80031-regulator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/regulator/tps80031-regulator.h b/include/linux/regulator/tps80031-regulator.h index ed0838a6c3bc..e76c4b895587 100644 --- a/include/linux/regulator/tps80031-regulator.h +++ b/include/linux/regulator/tps80031-regulator.h @@ -58,6 +58,7 @@ enum { LDO3_OUTPUT_VIB = 0x00000004, /* VBUS configuration */ + VBUS_DISCHRG_EN_PDN = 0x00000004, VBUS_SW_ONLY = 0x00000008, VBUS_SW_N_ID = 0x00000010, @@ -76,6 +77,7 @@ enum { * @init_apply: Init parameter applied or not. * @flags: Configuration flag to configure the rails. It should be ORed of * above enums. + * @delay_us: Delay in microsecond after setting the desired voltage. */ struct tps80031_regulator_platform_data { @@ -84,6 +86,7 @@ struct tps80031_regulator_platform_data { unsigned init_enable:1; unsigned init_apply:1; unsigned int flags; + int delay_us; }; #endif /* __REGULATOR_TPS80031_H */ |