summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2011-11-08 11:36:02 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:50:03 -0800
commit06d83985d3959fae1c27898c55ccb541025c7d3a (patch)
treea5ab2c1609f746e63a53a2102e5d105e510130c3 /include/linux/regulator
parent53300ac9ea9da75f06dd955800f3bdf6280d8a94 (diff)
mfd: tps80031: Move external pwr req to core driver
Moving the configuration function for configuring the rail control through the PREQ line to core from regulator driver. Fixing the correct voltage configuration for the LDO2 based on TRACK mode. Reviewed-on: http://git-master/r/63503 (cherry picked from commit 9190130f6cf1ba0bae3231321841ebe4ad94a54e) Change-Id: I7dd511da7f809a44b1e66706054c0a4c57c36323 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/64055 Rebase-Id: R433728b4c83ccaf6f3ae2734412a90d9c89b6a2c
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/tps80031-regulator.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/regulator/tps80031-regulator.h b/include/linux/regulator/tps80031-regulator.h
index e76c4b895587..d84a8c48b4f0 100644
--- a/include/linux/regulator/tps80031-regulator.h
+++ b/include/linux/regulator/tps80031-regulator.h
@@ -61,11 +61,6 @@ enum {
VBUS_DISCHRG_EN_PDN = 0x00000004,
VBUS_SW_ONLY = 0x00000008,
VBUS_SW_N_ID = 0x00000010,
-
- /* Power requests */
- PWR_REQ_INPUT_PREQ1 = 0x00000020,
- PWR_REQ_INPUT_PREQ2 = 0x00000040,
- PWR_REQ_INPUT_PREQ3 = 0x00000080,
};
/*
@@ -75,6 +70,7 @@ enum {
* @init_uV: initial micro volts which need to be set.
* @init_enable: Enable or do not enable the rails during initialization.
* @init_apply: Init parameter applied or not.
+ * @ext_pwr_ctrl: External power request control.
* @flags: Configuration flag to configure the rails. It should be ORed of
* above enums.
* @delay_us: Delay in microsecond after setting the desired voltage.
@@ -85,6 +81,7 @@ struct tps80031_regulator_platform_data {
int init_uV;
unsigned init_enable:1;
unsigned init_apply:1;
+ unsigned int ext_pwr_ctrl;
unsigned int flags;
int delay_us;
};