diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-02-21 08:13:47 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-02-21 08:13:47 +0100 |
| commit | 1303311d8ee63429eaaec71c4c7aa198b93e0456 (patch) | |
| tree | aab6fdd109a0fddebe78a78f99767d7413f113ec /arch/arm/mach-tegra/board-colibri_t30-pinmux.c | |
| parent | 36113b0e5262bba23c10599858096e08f1c54110 (diff) | |
colibri_t30: fix gpio-key pull-ups
Due to missing pull-ups on the gpio-key pins Android unintentionally
entered safe-mode.
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t30-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30-pinmux.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c index 67a124b460c4..87692bfa31ff 100644 --- a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c +++ b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c @@ -194,8 +194,8 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = { I2C_PINMUX(GEN1_I2C_SCL, I2C1, NORMAL, NORMAL, INPUT, DEFAULT, ENABLE), I2C_PINMUX(GEN1_I2C_SDA, I2C1, NORMAL, NORMAL, INPUT, DEFAULT, ENABLE), - I2C_PINMUX(GEN2_I2C_SCL, RSVD3, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE), - I2C_PINMUX(GEN2_I2C_SDA, RSVD3, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE), + I2C_PINMUX(GEN2_I2C_SCL, RSVD3, PULL_UP, NORMAL, INPUT, DEFAULT, DISABLE), + I2C_PINMUX(GEN2_I2C_SDA, RSVD3, PULL_UP, NORMAL, INPUT, DEFAULT, DISABLE), DEFAULT_PINMUX(GMI_A16, UARTD, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GMI_A17, UARTD, NORMAL, NORMAL, INPUT), @@ -309,7 +309,7 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = { #ifdef COLIBRI_T30_VI DEFAULT_PINMUX(GPIO_PCC2, RSVD1, NORMAL, TRISTATE, OUTPUT), #else - DEFAULT_PINMUX(GPIO_PCC2, RSVD1, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(GPIO_PCC2, RSVD1, PULL_UP, NORMAL, INPUT), #endif #endif /* COLIBRI_T30_SDMMC4B */ @@ -455,8 +455,8 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = { DEFAULT_PINMUX(PEX_L1_RST_N, RSVD2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(PEX_L2_CLKREQ_N, RSVD2, NORMAL, NORMAL, INPUT), #endif - DEFAULT_PINMUX(PEX_L2_PRSNT_N, RSVD2, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(PEX_L2_RST_N, RSVD2, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(PEX_L2_PRSNT_N, RSVD2, PULL_UP, NORMAL, INPUT), + DEFAULT_PINMUX(PEX_L2_RST_N, RSVD2, PULL_UP, NORMAL, INPUT), //GPIO DD3: LAN_PME DEFAULT_PINMUX(PEX_WAKE_N, RSVD2, NORMAL, NORMAL, INPUT), @@ -539,7 +539,7 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = { #endif /* COLIBRI_T30_SDMMC4B */ //GPIO K6: USB_ID, multiplexed ACC1_DETECT - DEFAULT_PINMUX(SPDIF_IN, HDA, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(SPDIF_IN, HDA, PULL_UP, NORMAL, INPUT), //GPIO K5: USBC_DET(VBUS), multiplexed USB1_VBUS DEFAULT_PINMUX(SPDIF_OUT, RSVD1, NORMAL, NORMAL, INPUT), @@ -567,10 +567,10 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = { DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(UART3_TXD, GMI, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(UART3_RXD, GMI, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART3_CTS_N, GMI, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART3_RTS_N, GMI, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(UART3_RXD, GMI, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(UART3_TXD, GMI, NORMAL, NORMAL, INPUT), //multiplexed SDMMC3_DAT7 DEFAULT_PINMUX(ULPI_CLK, SPI1, NORMAL, NORMAL, INPUT), |