[PATCH] ARM: imx: Modify IMX_IO_P2V macro

Robert Lee rob.lee at linaro.org
Wed May 9 20:24:17 EDT 2012


A change is needed in the IMX_IO_P2V macro to allow all imx5 platforms
to use common definitions when accessing registers of peripherals on
the AIPS2 bus.

This change was tested for mapping conflicts using the iop2v script
found at git://git.pengutronix.de/git/ukl/imx-iop2v.git and by
performing a bootup of a default build using imx_v6_v7_defconfig
on a imx51 babbage board and imx53 loco board.

Signed-off-by: Robert Lee <rob.lee at linaro.org>
---
 arch/arm/plat-mxc/include/mach/hardware.h |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h
index 0630513..065cc04 100644
--- a/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/arch/arm/plat-mxc/include/mach/hardware.h
@@ -96,6 +96,7 @@
  */
 #define IMX_IO_P2V(x)	(						\
 			0xf4000000 +					\
+			(((x) & 0x80000000) >> 7) +			\
 			(((x) & 0x50000000) >> 6) +			\
 			(((x) & 0x0b000000) >> 4) +			\
 			(((x) & 0x000fffff)))
-- 
1.7.10




More information about the linux-arm-kernel mailing list