diff options
| author | Rakesh Goyal <rgoyal@nvidia.com> | 2012-08-26 00:04:33 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-09-05 16:02:03 -0700 |
| commit | 6315861867aae8b64d04a46b05248c33b7d613db (patch) | |
| tree | 74ff6ecca74e02ad126c5069ed144e9f10974796 /arch/arm/mach-tegra/board-enterprise.c | |
| parent | e9db5831001626ab6ed6edfdb5641072780926a7 (diff) | |
ARM: tegra: tai: fix gpio number for nfc and bluetooth
NFC use GPIO4 for download firmware
BT_RST is required to make bluetooth on/off
Bug 1002637
Change-Id: Ic49a3fe606de618dfafdf0bc35b6a6fc1ac12cdd
Signed-off-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-on: http://git-master/r/128612
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index f3808a3b48fb..51db725d0223 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -1055,7 +1055,7 @@ static void enterprise_nfc_init(void) if (bi.board_id == BOARD_E1205 && bi.fab >= BOARD_FAB_A03) { nfc_pdata.firm_gpio = TEGRA_GPIO_PX7; } else if (bi.board_id == BOARD_E1239) { - nfc_pdata.firm_gpio = TEGRA_GPIO_PN6; + nfc_pdata.firm_gpio = TEGRA_GPIO_PD2; } } @@ -1077,7 +1077,7 @@ static void __init tegra_enterprise_init(void) enterprise_uart_init(); enterprise_usb_init(); if (board_info.board_id == BOARD_E1239) - enterprise_bt_rfkill_pdata[0].shutdown_gpio = TEGRA_GPIO_PF4; + enterprise_bt_rfkill_pdata[0].reset_gpio = TEGRA_GPIO_PF4; platform_add_devices(enterprise_devices, ARRAY_SIZE(enterprise_devices)); tegra_ram_console_debug_init(); |