diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-11-14 16:58:04 +0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-11-15 11:48:27 -0800 |
| commit | d3eadaf1b3aea0ea12debbf0fb207a7f573c8492 (patch) | |
| tree | f573d120e30e6e7386f80f97f981fc928e7df260 /arch | |
| parent | 47d81fa441edaf8d142e0ac1e4c858f619b9a31d (diff) | |
spi: add TEGRA_SLINK4_BASE and TEGRA_SPIFLASH_BASE in prep for tegra3
BUG=chromium-os:21033
TEST=emerge-{tegra2_seaboard,waluigi} chromeos-u-boot
Change-Id: Icee2c26f36937e96c24318979179ba3a0cbfc09c
Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/11597
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra.h | 10 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/tegra.h | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra3/tegra.h | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-tegra/tegra.h b/arch/arm/include/asm/arch-tegra/tegra.h index 317b24f02d8..3820918c04f 100644 --- a/arch/arm/include/asm/arch-tegra/tegra.h +++ b/arch/arm/include/asm/arch-tegra/tegra.h @@ -24,6 +24,16 @@ #ifndef _TEGRA_H_ #define _TEGRA_H_ +#if !(defined(TEGRA_SLINK4_BASE) ^ defined(TEGRA_SPIFLASH_BASE)) +#error "define either TEGRA_SLINK4_BASE or TEGRA_SPIFLASH_BASE" +#endif + +#ifdef TEGRA_SLINK4_BASE +#define TEGRA_SPI_BASE TEGRA_SLINK4_BASE +#else +#define TEGRA_SPI_BASE TEGRA_SPIFLASH_BASE +#endif + #define NV_PA_ARM_PERIPHBASE 0x50040000 #define NV_PA_PG_UP_BASE 0x60000000 #define NV_PA_TMRUS_BASE 0x60005010 diff --git a/arch/arm/include/asm/arch-tegra2/tegra.h b/arch/arm/include/asm/arch-tegra2/tegra.h index 68b424a9bf8..39a03e94dd0 100644 --- a/arch/arm/include/asm/arch-tegra2/tegra.h +++ b/arch/arm/include/asm/arch-tegra2/tegra.h @@ -24,8 +24,9 @@ #ifndef _TEGRA2_H_ #define _TEGRA2_H_ +#define TEGRA_SPIFLASH_BASE 0x7000C380 /* SPI1, T20 */ + #define NV_PA_SDRAM_BASE 0x00000000 -#define TEGRA_SPI_BASE 0x7000C380 #define NV_PA_SDMMC1_BASE 0xC8000000 #define NV_PA_SDMMC2_BASE 0xC8000200 diff --git a/arch/arm/include/asm/arch-tegra3/tegra.h b/arch/arm/include/asm/arch-tegra3/tegra.h index 92a19703c31..b0baacabf3a 100644 --- a/arch/arm/include/asm/arch-tegra3/tegra.h +++ b/arch/arm/include/asm/arch-tegra3/tegra.h @@ -24,6 +24,8 @@ #ifndef _TEGRA3_H_ #define _TEGRA3_H_ +#define TEGRA_SLINK4_BASE 0x7000DA00 /* aka SBC4 */ + #define NV_PA_SDRAM_BASE 0x80000000 #define NV_PA_SDMMC1_BASE 0x78000000 |