diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-01 13:37:27 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-09-15 12:41:21 -0700 |
| commit | e26a6be71dd36659af343b9f0ec14ea981d23692 (patch) | |
| tree | ca930432571f968fd174b3cfaea6533d9ed62c60 /arch/arm/include | |
| parent | 0797d6dcb08ce12f7040a5252d304f6a862fa8b7 (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 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra.h | 14 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/tegra.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/tegra2_spi.h | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-tegra/tegra.h b/arch/arm/include/asm/arch-tegra/tegra.h index 0282b6b4067..023e441f155 100644 --- a/arch/arm/include/asm/arch-tegra/tegra.h +++ b/arch/arm/include/asm/arch-tegra/tegra.h @@ -38,15 +38,17 @@ #define NV_PA_APB_UARTC_BASE (NV_PA_APB_MISC_BASE + 0x6200) #define NV_PA_APB_UARTD_BASE (NV_PA_APB_MISC_BASE + 0x6300) #define NV_PA_APB_UARTE_BASE (NV_PA_APB_MISC_BASE + 0x6400) -#define TEGRA2_NAND_BASE 0x70008000 -#define TEGRA2_I2C1_BASE 0x7000C000 -#define TEGRA2_I2C2_BASE 0x7000C400 -#define TEGRA2_I2C3_BASE 0x7000C500 -#define TEGRA2_DVC_BASE 0x7000D000 +#define TEGRA_NAND_BASE 0x70008000 +#define TEGRA_I2C1_BASE 0x7000C000 +#define TEGRA_I2C2_BASE 0x7000C400 +#define TEGRA_I2C3_BASE 0x7000C500 +#define TEGRA_DVC_BASE 0x7000D000 +#define TEGRA_KBC_BASE 0x7000E200 #define NV_PA_PMC_BASE 0x7000E400 #define NV_PA_EMC_BASE 0x7000F400 #define NV_PA_FUSE_BASE 0x7000F800 #define NV_PA_CSITE_BASE 0x70040000 + #define NV_PA_USB1_BASE 0xC5000000 #define NV_PA_USB3_BASE 0xC5008000 #define NV_PA_SDMMC1_BASE 0xC8000000 @@ -54,7 +56,7 @@ #define NV_PA_SDMMC3_BASE 0xC8000400 #define NV_PA_SDMMC4_BASE 0xC8000600 -#define TEGRA2_SDRC_CS0 NV_PA_SDRAM_BASE +#define TEGRA_SDRC_CS0 NV_PA_SDRAM_BASE #define LOW_LEVEL_SRAM_STACK 0x4000FFFC #define EARLY_AVP_STACK (NV_PA_SDRAM_BASE + 0x20000) #define EARLY_CPU_STACK (EARLY_AVP_STACK - 4096) diff --git a/arch/arm/include/asm/arch-tegra2/tegra.h b/arch/arm/include/asm/arch-tegra2/tegra.h index 5f829d5c455..2ef29374dd3 100644 --- a/arch/arm/include/asm/arch-tegra2/tegra.h +++ b/arch/arm/include/asm/arch-tegra2/tegra.h @@ -25,6 +25,7 @@ #define _TEGRA2_H_ #define NV_PA_SDRAM_BASE 0x00000000 +#define TEGRA_SPI_BASE 0x7000C380 #include <asm/arch-tegra/tegra.h> diff --git a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h b/arch/arm/include/asm/arch-tegra2/tegra2_spi.h index 1875a7a8315..72dc868831a 100644 --- a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h +++ b/arch/arm/include/asm/arch-tegra2/tegra2_spi.h @@ -27,8 +27,6 @@ #include <asm/types.h> -#define TEGRA2_SPI_BASE 0x7000C380 - struct spi_tegra { u32 command; /* SPI_COMMAND_0 register */ u32 status; /* SPI_STATUS_0 register */ |