Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c5c90d authored Nov 29, 2013 by Pratyush Anand Committed by Viresh Kumar Jul 14, 2014

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>

parent 64562e99

arch/arm/mach-spear/include/mach/spear.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

arch/arm/mach-spear/spear13xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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