diff options
| author | Raj Jayaraman <rjayaraman@nvidia.com> | 2011-02-02 18:23:42 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:45:35 -0800 |
| commit | c5a57bf3d3be250c23b60118d79a8cf77fd7f384 (patch) | |
| tree | 67345403fc7146119cb6b3b33f0578c488bbde82 /arch | |
| parent | 39b4ede5d99e5f80f742d5a5a66c85d8396d50b5 (diff) | |
arm: tegra: cardhu: Enable gps support.
Original-Change-Id: Ib4264386d3d31d5694531f857bd97e6aef160647
Reviewed-on: http://git-master/r/18107
Reviewed-by: Rajkumar Jayaraman <rjayaraman@nvidia.com>
Tested-by: Rajkumar Jayaraman <rjayaraman@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I9a8aeb7b4a56ef9f8d2fad85ba606a4f2e18320c
Rebase-Id: Rc463b74b9dae0691bc66984cf40b3d578a86f445
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-pinmux.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-pinmux.c b/arch/arm/mach-tegra/board-cardhu-pinmux.c index b63406b1ade1..c3936bcbf1af 100644 --- a/arch/arm/mach-tegra/board-cardhu-pinmux.c +++ b/arch/arm/mach-tegra/board-cardhu-pinmux.c @@ -244,8 +244,8 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux[] = { DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, OUTPUT), - DEFAULT_PINMUX(UART2_RTS_N, GMI, NORMAL, NORMAL, OUTPUT), - DEFAULT_PINMUX(UART2_CTS_N, GMI, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(UART2_RTS_N, UARTB, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(UART2_CTS_N, UARTB, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART3_TXD, UARTC, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(UART3_RXD, UARTC, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART3_CTS_N, UARTC, NORMAL, NORMAL, INPUT), diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 6aa1aac7f13f..28fbae9acd62 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -339,6 +339,10 @@ static void cardhu_usb_init(void) platform_device_register(&tegra_ehci3_device); } +static void cardhu_gps_init(void) +{ + tegra_gpio_enable(TEGRA_GPIO_PU2); +} #ifdef CONFIG_SATA_AHCI_TEGRA static void cardhu_sata_init(void) @@ -366,6 +370,7 @@ static void __init tegra_cardhu_init(void) cardhu_suspend_init(); cardhu_touch_init(); cardhu_usb_init(); + cardhu_gps_init(); #ifdef CONFIG_KEYBOARD_TEGRA cardhu_kbc_init(); |