diff options
| author | Puneet Saxena <puneets@nvidia.com> | 2012-01-20 12:19:27 +0530 |
|---|---|---|
| committer | Puneet Saxena <puneets@nvidia.com> | 2012-02-06 22:22:25 -0800 |
| commit | 3847bc3cce6eed1edbec23cac715e34ffb463638 (patch) | |
| tree | b977b3892a88827cabe554ef6562edf10c37426f /drivers | |
| parent | 0277eafa2b8d09853e089ade710e3e8d091b996c (diff) | |
Arm: tegra3: Add 16x8 keyboard support
Expand existing 4x6 keyboard support to 16x8 keyboard.
Add Tegra2 specific changes under Tegra2 config "CONFIG_TEGRA2".
BUG=chromium-os:23496
TEST=Tested on Waluigi.key press echoes the key on console.
Built ok for Cardhu and Seaboard.
Change-Id: Iab291a636d41b721d914014a5fe9ecc8775bf260
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/13928
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/input/tegra-kbc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index 961c7b8dba..aa3cbcaa96 100755 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -22,13 +22,14 @@ */ #include <common.h> -#include <malloc.h> #include <stdio_dev.h> #include <asm/io.h> #include <asm/arch/clock.h> -#include <asm/arch/pinmux.h> #include <tegra-kbc.h> #include <fdt_decode.h> +#if defined(CONFIG_TEGRA2) +#include <asm/arch/pinmux.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -508,6 +509,7 @@ static int tegra_kbc_open(void) return 0; } +#if defined(CONFIG_TEGRA2) void config_kbc_pinmux(void) { enum pmux_pingrp pingrp[] = {PINGRP_KBCA, PINGRP_KBCB, PINGRP_KBCC, @@ -520,6 +522,7 @@ void config_kbc_pinmux(void) pinmux_set_pullupdown(pingrp[i], PMUX_PULL_UP); } } +#endif int drv_keyboard_init(void) { @@ -547,7 +550,9 @@ int drv_keyboard_init(void) kbc_fn_keycode = board_keyboard_config.fn_keycode; #endif +#if defined(CONFIG_TEGRA2) config_kbc_pinmux(); +#endif /* * All of the Tegra board use the same clock configuration for now. |