Commit a8a05b85 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mx51: use IMX_IO_ADDRESS to define MX51_IO_ADDRESS 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 68b5e858

arch/arm/plat-mxc/include/mach/mx51.h

+11 −42
Original line number Diff line number Diff line
@@ -163,6 +163,17 @@ 
#define MX51_GPU2D_BASE_ADDR		0xd0000000

#define MX51_TZIC_BASE_ADDR		0xe0000000



#define MX51_IO_ADDRESS(x) (						\

	IMX_IO_ADDRESS(x, MX51_IRAM) ?:					\

	IMX_IO_ADDRESS(x, MX51_DEBUG) ?:				\

	IMX_IO_ADDRESS(x, MX51_SPBA0) ?:				\

	IMX_IO_ADDRESS(x, MX51_AIPS1) ?:				\

	IMX_IO_ADDRESS(x, MX51_AIPS2))



/* This is currently used in <mach/debug-macro.S>, but should go away */

#define MX51_AIPS1_IO_ADDRESS(x)  \

	(((x) - MX51_AIPS1_BASE_ADDR) + MX51_AIPS1_BASE_ADDR_VIRT)



/*

 * defines for SPBA modules

 */
@@ -210,48 +221,6 @@ 
#define MX51_MXC_DMA_CHANNEL_ATA_TX	MXC_DMA_DYNAMIC_CHANNEL

#define MX51_MXC_DMA_CHANNEL_MEMORY	MXC_DMA_DYNAMIC_CHANNEL



/* Does given address belongs to the specified memory region? */

#define ADDRESS_IN_REGION(addr, start, size)			\

	(((addr) >= (start)) && ((addr) < (start)+(size)))



/* Does given address belongs to the specified named `module'? */

#define MX51_IS_MODULE(addr, module)			       \

	ADDRESS_IN_REGION(addr, MX51_ ## module ## _BASE_ADDR, \

				MX51_ ## module ## _SIZE)

/*

 * This macro defines the physical to virtual address mapping for all the

 * peripheral modules. It is used by passing in the physical address as x

 * and returning the virtual address. If the physical address is not mapped,

 * it returns 0xdeadbeef

 */



#define MX51_IO_ADDRESS(x)					\

	(void __iomem *)					\

	(MX51_IS_MODULE(x, IRAM) ? MX51_IRAM_IO_ADDRESS(x) :	\

	MX51_IS_MODULE(x, DEBUG) ? MX51_DEBUG_IO_ADDRESS(x) :	\

	MX51_IS_MODULE(x, SPBA0) ? MX51_SPBA0_IO_ADDRESS(x) :	\

	MX51_IS_MODULE(x, AIPS1) ? MX51_AIPS1_IO_ADDRESS(x) :	\

	MX51_IS_MODULE(x, AIPS2) ? MX51_AIPS2_IO_ADDRESS(x) : \

	0xdeadbeef)



/*

 * define the address mapping macros: in physical address order

 */

#define MX51_IRAM_IO_ADDRESS(x)  \

	(((x) - MX51_IRAM_BASE_ADDR) + MX51_IRAM_BASE_ADDR_VIRT)



#define MX51_DEBUG_IO_ADDRESS(x)  \

	(((x) - MX51_DEBUG_BASE_ADDR) + MX51_DEBUG_BASE_ADDR_VIRT)



#define MX51_SPBA0_IO_ADDRESS(x)  \

	(((x) - MX51_SPBA0_BASE_ADDR) + MX51_SPBA0_BASE_ADDR_VIRT)



#define MX51_AIPS1_IO_ADDRESS(x)  \

	(((x) - MX51_AIPS1_BASE_ADDR) + MX51_AIPS1_BASE_ADDR_VIRT)



#define MX51_AIPS2_IO_ADDRESS(x)  \

	(((x) - MX51_AIPS2_BASE_ADDR) + MX51_AIPS2_BASE_ADDR_VIRT)



#define MX51_IS_MEM_DEVICE_NONSHARED(x)		0



/*