summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaj Jayaraman <rjayaraman@nvidia.com>2011-06-13 14:18:41 -0700
committerShail Dave <sdave@nvidia.com>2011-06-16 17:07:43 -0700
commitcc483a257c8ba6b9ca11fbcd1d38bad26ffe3cb8 (patch)
treea73f45bfef9b33b9e1d2cbcf21a90058e31fb247
parent081c1bf3b1d77e808742741ea2977034eba23382 (diff)
arm: tegra: cardhu: Modify modem w_disable control.
Gpio controlling w_disable has changed since Fab3. Modify it accordingly. Bug 819563 Cherry picked from main. [DO NOT INTEGRATE TO MAIN] Change-Id: Ic403d981a742eaa55fbdbb7f0986dee0ff957c31 Reviewed-on: http://git-master/r/37122 Reviewed-by: Rajkumar Jayaraman <rjayaraman@nvidia.com> Tested-by: Rajkumar Jayaraman <rjayaraman@nvidia.com> Reviewed-by: Shail Dave <sdave@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-cardhu.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c
index d168c1742fe8..8de0617cb2df 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.c
@@ -679,7 +679,23 @@ static void cardhu_gps_init(void)
static void cardhu_modem_init(void)
{
- tegra_gpio_enable(TEGRA_GPIO_PH5);
+ struct board_info board_info;
+ int w_disable_gpio;
+
+ tegra_get_board_info(&board_info);
+ switch (board_info.board_id) {
+ case BOARD_E1291:
+ if (board_info.fab < 0x3) {
+ w_disable_gpio = TEGRA_GPIO_PH5;
+ } else {
+ w_disable_gpio = TEGRA_GPIO_PDD5;
+ }
+ tegra_gpio_enable(w_disable_gpio);
+ gpio_direction_input(w_disable_gpio);
+ break;
+ default:
+ break;
+ }
}
#ifdef CONFIG_SATA_AHCI_TEGRA