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>

4 files changed, 16 insertions, 18 deletions

diff --git a/drivers/i2c/tegra2_i2c.c b/drivers/i2c/tegra2_i2c.c
index 81455f8625..f069c4d437 100644
--- a/drivers/i2c/tegra2_i2c.c
+++ b/drivers/i2c/tegra2_i2c.c
@@ -393,10 +393,10 @@ static const enum periph_id i2c_periph_ids[CONFIG_SYS_MAX_I2C_BUS] = {
 };
 
 static const u32 *i2c_bus_base[CONFIG_SYS_MAX_I2C_BUS] = {
-	(u32 *)TEGRA2_DVC_BASE,
-	(u32 *)TEGRA2_I2C1_BASE,
-	(u32 *)TEGRA2_I2C2_BASE,
-	(u32 *)TEGRA2_I2C3_BASE
+	(u32 *)TEGRA_DVC_BASE,
+	(u32 *)TEGRA_I2C1_BASE,
+	(u32 *)TEGRA_I2C2_BASE,
+	(u32 *)TEGRA_I2C3_BASE
 };
 
 /* pinmux_configs based on the pinmux configuration */
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index 0833fc42c3..961c7b8dba 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;
 
diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra2_spi.c
index 7885a347d7..3c00928177 100644
--- a/drivers/spi/tegra2_spi.c
+++ b/drivers/spi/tegra2_spi.c
@@ -76,7 +76,7 @@ void spi_free_slave(struct spi_slave *slave)
 
 void spi_init(void)
 {
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	u32 reg;
 
 	/* Change SPI clock to 48MHz, PLLP_OUT0 source */
@@ -131,7 +131,7 @@ void spi_release_bus(struct spi_slave *slave)
 
 void spi_cs_activate(struct spi_slave *slave)
 {
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	u32 val;
 
 	spi_enable();
@@ -143,7 +143,7 @@ void spi_cs_activate(struct spi_slave *slave)
 
 void spi_cs_deactivate(struct spi_slave *slave)
 {
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	u32 val;
 
 	/* CS is negated on Tegra, so drive a 0 to get a 1 */
@@ -154,7 +154,7 @@ void spi_cs_deactivate(struct spi_slave *slave)
 int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
 		void *din, unsigned long flags)
 {
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	unsigned int status;
 	int num_bytes = (bitlen + 7) / 8;
 	int i, ret, tm, bytes, bits, isRead = 0;
diff --git a/drivers/spi/tegra2_spi_new.c b/drivers/spi/tegra2_spi_new.c
index f4d8d1ca6f..191cef26d6 100644
--- a/drivers/spi/tegra2_spi_new.c
+++ b/drivers/spi/tegra2_spi_new.c
@@ -76,7 +76,7 @@ void spi_free_slave(struct spi_slave *slave)
 
 void spi_init(void)
 {
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	u32 reg;
 
 	/* Change SPI clock to 24MHz, PLLP_OUT0 source */
@@ -131,7 +131,7 @@ void spi_release_bus(struct spi_slave *slave)
 
 void spi_cs_activate(struct spi_slave *slave)
 {
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	u32 val;
 
 	spi_enable();
@@ -143,7 +143,7 @@ void spi_cs_activate(struct spi_slave *slave)
 
 void spi_cs_deactivate(struct spi_slave *slave)
 {
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	u32 val;
 
 	/* CS is negated on Tegra, so drive a 0 to get a 1 */
@@ -199,7 +199,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout,
 {
 	int retval = 0;
 	char *delayed_msg = NULL;
-	struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE;
+	struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE;
 	uint32_t status;
 	uint32_t writecnt = (bitsout + 7) / 8;
 	uint32_t readcnt = (bitsin + 7) / 8;