tegra: stingray: Changes for Whisper 0.4

Change-Id: I55f0c1e6cad26c6386dfb8cc6224720965b4598e
Signed-off-by: Greg Meiste <w30289@motorola.com>

diff --git a/arch/arm/mach-tegra/board-stingray-pinmux.c b/arch/arm/mach-tegra/board-stingray-pinmux.c
index e91b4346a5e7aeffe9916113fc7d3c95189b5b8e..b0b28aa9e3c3a5c9b0fef4724ded78ece494ff21 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray-pinmux.c
+++ b/arch/arm/mach-tegra/board-stingray-pinmux.c
@@ -39,7 +39,7 @@ static __initdata struct tegra_pingroup_config stingray_pinmux[] = {
        {TEGRA_PINGROUP_DAP4,  TEGRA_MUX_DAP4,          TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
        {TEGRA_PINGROUP_DDC,   TEGRA_MUX_I2C2,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},
        {TEGRA_PINGROUP_DTA,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
-       {TEGRA_PINGROUP_DTB,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
+       {TEGRA_PINGROUP_DTB,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
        {TEGRA_PINGROUP_DTC,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
        {TEGRA_PINGROUP_DTD,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
        {TEGRA_PINGROUP_DTE,   TEGRA_MUX_VI,            TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

diff --git a/arch/arm/mach-tegra/board-stingray-spi.c b/arch/arm/mach-tegra/board-stingray-spi.c
index fe26d5fa4d4b7d6433554ba8b62e6332a3e61901..1cf7e68b4fa6256ee4ba0fa8c089f3148f15510c 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray-spi.c
+++ b/arch/arm/mach-tegra/board-stingray-spi.c
@@ -193,8 +193,9 @@ static struct platform_device cpcap_3mm5_device = {
 };
 
 static struct cpcap_whisper_pdata whisper_pdata = {
-       .gpio    = TEGRA_GPIO_PV4,
-       .uartmux = 1,
+       .data_gpio = TEGRA_GPIO_PV4,
+       .pwr_gpio  = TEGRA_GPIO_PT2,
+       .uartmux   = 1,
 };
 
 static struct platform_device cpcap_whisper_device = {
@@ -533,6 +534,10 @@ int __init stingray_spi_init(void)
 {
        int i;
 
+       tegra_gpio_enable(TEGRA_GPIO_PT2);
+       gpio_request(TEGRA_GPIO_PT2, "usb_host_pwr_en");
+       gpio_direction_output(TEGRA_GPIO_PT2, 0);
+
        spi_register_board_info(stingray_spi_board_info,
                                ARRAY_SIZE(stingray_spi_board_info));