diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20-pinmux.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c index f11fc708c1b8..7ce2e10397b9 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c +++ b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c @@ -223,7 +223,7 @@ static __initdata struct tegra_pingroup_config colibri_t20_pinmux[] = { {TEGRA_PINGROUP_SLXK, TEGRA_MUX_SPI4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, /* GPIO K6 multiplexed ACC1_DETECT */ - {TEGRA_PINGROUP_SPDI, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_TRISTATE}, + {TEGRA_PINGROUP_SPDI, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, /* GPIO K5 multiplexed USB1_VBUS */ {TEGRA_PINGROUP_SPDO, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_TRISTATE}, diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index fc2fb681cd9e..de58d1eb76e9 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -164,6 +164,9 @@ static struct gpio colibri_t20_gpios[] = { //conflicts with CAN reset on MECS Tellurium xPOD1 CAN {TEGRA_GPIO_PK4, GPIOF_IN, "SODIMM pin 106"}, // {TEGRA_GPIO_PK5, GPIOF_IN, "USBC_DET"}, +#ifndef CONFIG_KEYBOARD_GPIO + {TEGRA_GPIO_PK6, GPIOF_IN, "SODIMM pin 135"}, +#endif #ifndef CAMERA_INTERFACE {TEGRA_GPIO_PL0, GPIOF_IN, "SOD-101, Iris X16-16"}, {TEGRA_GPIO_PL1, GPIOF_IN, "SOD-103, Iris X16-15"}, |