diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-14 10:04:55 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-14 10:04:55 +0100 |
| commit | 003c46bfafa8ca4f4057888e12018bb22cae6458 (patch) | |
| tree | 2f2a61c7b6b7587a04e8912332d52bca4fcc4bb6 /arch/arm/mach-tegra/board-colibri_t20.c | |
| parent | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (diff) | |
colibri_t20: fix keyboard GPIO resp. GPIO K6
SODIMM pin 135 is really GPIO K6 multiplexed with ACC1_DETECT. Unfortunately the later can't be tri-stated but since it is anyway always an input it should not interfere. Please note however that this SODIMM pin is rather low resistance.
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t20.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20.c | 3 |
1 files changed, 3 insertions, 0 deletions
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"}, |