diff options
| author | Bo Yan <byan@nvidia.com> | 2013-05-30 23:24:50 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:26:29 -0700 |
| commit | 58315989812e0aed4723e8eee9ef46a9215e07fc (patch) | |
| tree | 556e6a9ef6f6930f68be616d257a2df62c4929a5 /arch/arm/mach-tegra/iomap.h | |
| parent | 19bacfdf29dd11747cb54aed9a4e10d5ec895201 (diff) | |
ARM: tegra: Update iomap
Make IO address map forward compatible
Change-Id: I3e80b3ccc9e749f61f14c5ed8415f56f1563f747
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/234746
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chao Xu <cxu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/iomap.h')
| -rw-r--r-- | arch/arm/mach-tegra/iomap.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/iomap.h b/arch/arm/mach-tegra/iomap.h index c9e4f81990d1..83e263faad76 100644 --- a/arch/arm/mach-tegra/iomap.h +++ b/arch/arm/mach-tegra/iomap.h @@ -251,7 +251,8 @@ #define TEGRA_AHB_DMA_CH0_BASE 0x60009000 #define TEGRA_AHB_DMA_CH0_SIZE 32 -#if defined(CONFIG_ARCH_TEGRA_14x_SOC) || defined(CONFIG_ARCH_TEGRA_12x_SOC) +#if !defined(CONFIG_ARCH_TEGRA_2x_SOC) && !defined(CONFIG_ARCH_TEGRA_3x_SOC) \ + && !defined(CONFIG_ARCH_TEGRA_11x_SOC) #define TEGRA_APB_DMA_BASE 0x60020000 #define TEGRA_APB_DMA_SIZE SZ_4K @@ -785,7 +786,8 @@ #endif -#if defined(CONFIG_ARCH_TEGRA_14x_SOC) || defined(CONFIG_ARCH_TEGRA_12x_SOC) +#if !defined(CONFIG_ARCH_TEGRA_2x_SOC) && !defined(CONFIG_ARCH_TEGRA_3x_SOC) \ + && !defined(CONFIG_ARCH_TEGRA_11x_SOC) #define TEGRA_I2C6_BASE 0x7000d100 #define TEGRA_I2C6_SIZE SZ_512 |