summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/iomap.h
diff options
context:
space:
mode:
authorKen Adams <kadams@nvidia.com>2012-10-18 18:14:24 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:21:30 -0700
commit19cd7e6f0cfd91b8d0b4bfc74206000bed52787e (patch)
tree59446d502c1310baad29bf8da2d651d0163f76e8 /arch/arm/mach-tegra/iomap.h
parent2796f8cea8cd94662fa13fc69d797b3b22de1fd0 (diff)
ARM: tegra: iomap: Tegra12 ISP
Updates ISP and ISPB addresses. Change-Id: Ib10b45557b19bd6473e14af17457063ac1628225 Signed-off-by: Ken Adams <kadams@nvidia.com> Reviewed-on: http://git-master/r/145722
Diffstat (limited to 'arch/arm/mach-tegra/iomap.h')
-rw-r--r--arch/arm/mach-tegra/iomap.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/iomap.h b/arch/arm/mach-tegra/iomap.h
index b7ad926d6407..6d18059de5a2 100644
--- a/arch/arm/mach-tegra/iomap.h
+++ b/arch/arm/mach-tegra/iomap.h
@@ -84,8 +84,20 @@
#define TEGRA_VI_BASE 0x54080000
#define TEGRA_VI_SIZE SZ_256K
+#if defined(CONFIG_ARCH_TEGRA_2x_SOC) || \
+ defined(CONFIG_ARCH_TEGRA_3x_SOC) || \
+ defined(CONFIG_ARCH_TEGRA_11x_SOC) || \
+ defined(CONFIG_ARCH_TEGRA_14x_SOC)
#define TEGRA_ISP_BASE 0x54100000
#define TEGRA_ISP_SIZE SZ_256K
+#else
+#define TEGRA_ISP_BASE 0x54600000
+#define TEGRA_ISP_SIZE SZ_256K
+
+#define TEGRA_ISPB_BASE 0x54680000
+#define TEGRA_ISPB_SIZE SZ_256K
+#endif
+
#define TEGRA_GR2D_BASE 0x54140000
#define TEGRA_GR2D_SIZE SZ_256K