summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear
diff options
context:
space:
mode:
authorPratyush Anand <pratyush.anand@st.com>2013-11-29 15:57:35 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2014-07-14 11:04:42 +0530
commit36c5c90d4c24d692fe158f5bfe4c97f28fd6ebba (patch)
treec684e30478521409025a3545a4a1e75db0fba463 /arch/arm/mach-spear
parent64562e99477fc58a11e7f351f959c956586906e1 (diff)
downloadlinux-36c5c90d4c24d692fe158f5bfe4c97f28fd6ebba.tar.gz
linux-36c5c90d4c24d692fe158f5bfe4c97f28fd6ebba.tar.bz2
linux-36c5c90d4c24d692fe158f5bfe4c97f28fd6ebba.zip
ARM: SPEAr13xx: Fix static mapping table
SPEAr13xx was using virtual address space 0xFE000000 to map physical address space 0xB3000000. But pci_remap_io uses 0xFEE00000 as virtual address and so replace 0xFE000000 with 0xF9000000. Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Pratyush Anand <pratyush.anand@st.com> Signed-off-by: Mohit Kumar <mohit.kumar@st.com> [viresh: fixed logs/cclist] Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/mach-spear')
-rw-r--r--arch/arm/mach-spear/include/mach/spear.h4
-rw-r--r--arch/arm/mach-spear/spear13xx.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h
index 5cdc53d9b653..f2d6a0176575 100644
--- a/arch/arm/mach-spear/include/mach/spear.h
+++ b/arch/arm/mach-spear/include/mach/spear.h
@@ -52,10 +52,10 @@
#ifdef CONFIG_ARCH_SPEAR13XX
#define PERIP_GRP2_BASE UL(0xB3000000)
-#define VA_PERIP_GRP2_BASE IOMEM(0xFE000000)
+#define VA_PERIP_GRP2_BASE IOMEM(0xF9000000)
#define MCIF_SDHCI_BASE UL(0xB3000000)
#define SYSRAM0_BASE UL(0xB3800000)
-#define VA_SYSRAM0_BASE IOMEM(0xFE800000)
+#define VA_SYSRAM0_BASE IOMEM(0xF9800000)
#define SYS_LOCATION (VA_SYSRAM0_BASE + 0x600)
#define PERIP_GRP1_BASE UL(0xE0000000)
diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
index c9897ea38980..53a761482a7c 100644
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@ -52,7 +52,7 @@ void __init spear13xx_l2x0_init(void)
/*
* Following will create 16MB static virtual/physical mappings
* PHYSICAL VIRTUAL
- * 0xB3000000 0xFE000000
+ * 0xB3000000 0xF9000000
* 0xE0000000 0xFD000000
* 0xEC000000 0xFC000000
* 0xED000000 0xFB000000