arm: tegra: cardhu: Enable gps support.
Raj Jayaraman [Thu, 3 Feb 2011 02:23:42 +0000 (18:23 -0800)]
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

arch/arm/mach-tegra/board-cardhu-pinmux.c
arch/arm/mach-tegra/board-cardhu.c

index b63406b..c3936bc 100644 (file)
@@ -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),
index 6aa1aac..28fbae9 100644 (file)
@@ -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();