summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-cardhu-power.c
diff options
context:
space:
mode:
authorSumit Sharma <sumsharma@nvidia.com>2012-09-24 14:08:14 +0530
committerSimone Willett <swillett@nvidia.com>2012-09-25 11:57:12 -0700
commit1cc55c272a4605d6350d47487effdabbc49502e1 (patch)
tree64f15ddb44f47433df742e96ff01d32e300b0187 /arch/arm/mach-tegra/board-cardhu-power.c
parent8c633b36a9ad322492545317220d5f905385edff (diff)
ARM: tegra: Disabled pull-up of SLEEPP pin of tps6591x regulator
Bug 1042318 Disabled pull-up of SLEEPP pin of tps6591x regulator by adding pull-up init data in platform data Change-Id: I310c9656d4edfeec53058a0730ff0f2c0c200d78 Signed-off-by: Sumit Sharma <sumsharma@nvidia.com> Reviewed-on: http://git-master/r/134760 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-power.c')
-rw-r--r--arch/arm/mach-tegra/board-cardhu-power.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c
index b98355e49759..73cb33038b54 100644
--- a/arch/arm/mach-tegra/board-cardhu-power.c
+++ b/arch/arm/mach-tegra/board-cardhu-power.c
@@ -325,12 +325,30 @@ static struct tps6591x_sleep_keepon_data tps_slp_keepon = {
.clkout32k_keepon = 1,
};
+#define TPS_PUP_INIT_DATA(_pup_num, _pin_id, _pup_val) \
+ [_pup_num] = { \
+ .pin_id = _pin_id, \
+ .pup_val = _pup_val, \
+ }
+
+struct tps6591x_pup_init_data tps_pup_vals[] = {
+ TPS_PUP_INIT_DATA(0, TPS6591X_PUP_NRESPWRON2P, TPS6591X_PUP_DEFAULT),
+ TPS_PUP_INIT_DATA(1, TPS6591X_PUP_HDRSTP, TPS6591X_PUP_DEFAULT),
+ TPS_PUP_INIT_DATA(2, TPS6591X_PUP_PWRHOLDP, TPS6591X_PUP_DEFAULT),
+ TPS_PUP_INIT_DATA(3, TPS6591X_PUP_SLEEPP, TPS6591X_PUP_DIS),
+ TPS_PUP_INIT_DATA(4, TPS6591X_PUP_PWRONP, TPS6591X_PUP_DEFAULT),
+ TPS_PUP_INIT_DATA(5, TPS6591X_PUP_I2CSRP, TPS6591X_PUP_DEFAULT),
+ TPS_PUP_INIT_DATA(6, TPS6591X_PUP_I2CCTLP, TPS6591X_PUP_DEFAULT),
+};
+
static struct tps6591x_platform_data tps_platform = {
.irq_base = TPS6591X_IRQ_BASE,
.gpio_base = TPS6591X_GPIO_BASE,
.dev_slp_en = true,
.slp_keepon = &tps_slp_keepon,
.use_power_off = true,
+ .pup_data = tps_pup_vals,
+ .num_pins = ARRAY_SIZE(tps_pup_vals),
};
static struct i2c_board_info __initdata cardhu_regulators[] = {