summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-09-01 13:37:27 -0700
committerSimon Glass <sjg@chromium.org>2011-09-15 12:41:21 -0700
commite26a6be71dd36659af343b9f0ec14ea981d23692 (patch)
treeca930432571f968fd174b3cfaea6533d9ed62c60 /drivers/input
parent0797d6dcb08ce12f7040a5252d304f6a862fa8b7 (diff)
tegra: Rename TEGRA2 to TEGRA
Some constants are actually better of with generic Tegra family names. This also cleans up a few addresses which were in drivers rather than in the tegra.h header file. BUG=chromium-os:19004 TEST=build and boot on Seaboard Change-Id: I1cabb5191a2b36648a37268069beb3b43c12d0e1 Reviewed-on: http://gerrit.chromium.org/gerrit/7128 Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/input')
-rwxr-xr-xdrivers/input/tegra-kbc.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index 0833fc42c3b..961c7b8dbab 100755
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -41,8 +41,6 @@ enum {
#define KBC_MAX_KEY (KBC_MAX_ROW * KBC_MAX_COL)
-#define TEGRA2_KBC_BASE 0x7000E200
-
/* KBC row scan time and delay for beginning the row scan. */
#define KBC_ROW_SCAN_TIME 16
#define KBC_ROW_SCAN_DLY 5
@@ -139,7 +137,7 @@ static int is_ghost_key_config(int *rows_val, int *cols_val, int valid)
/* reads the keyboard fifo for current keypresses. */
static int tegra_kbc_find_keys(int *fifo)
{
- struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA2_KBC_BASE;
+ struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA_KBC_BASE;
int rows_val[KBC_MAX_KPENT], cols_val[KBC_MAX_KPENT];
u32 kp_ent_val[(KBC_MAX_KPENT + 3) / 4];
u32 *kp_ents = kp_ent_val;
@@ -246,7 +244,7 @@ static int tegra_kbc_get_single_char(u32 fifo_cnt)
/* manages keyboard hardware registers on keypresses and returns a key.*/
static unsigned char tegra_kbc_get_char(void)
{
- struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA2_KBC_BASE;
+ struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA_KBC_BASE;
u32 val, ctl;
char key = 0;
@@ -447,7 +445,7 @@ static int kbd_getc(void)
/* configures keyboard GPIO registers to use the rows and columns */
static void config_kbc(void)
{
- struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA2_KBC_BASE;
+ struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA_KBC_BASE;
int i;
for (i = 0; i < KBC_MAX_GPIO; i++) {
@@ -477,7 +475,7 @@ static void config_kbc(void)
static int tegra_kbc_open(void)
{
- struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA2_KBC_BASE;
+ struct kbc_tegra *kbc = (struct kbc_tegra *)TEGRA_KBC_BASE;
unsigned int scan_time_rows, debounce_cnt, rpt_cnt;
u32 val = 0;