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

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

mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESS 



This simplifies the macro and makes is similar to the other
..._IO_ADDRESS macros defined for imx SOCs.

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

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

+10 −48
Original line number Diff line number Diff line
@@ -184,60 +184,22 @@ 
#define MXC91231_CS4_BASE_ADDR		0xB4000000

#define MXC91231_CS5_BASE_ADDR		0xB6000000



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

#define ADDRESS_IN_REGION(addr, start, size) \

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



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

#define MXC91231_IS_MODULE(addr, module) \

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

	                        MXC91231_ ## 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 MXC91231_IO_ADDRESS(x) \

	(void __iomem *) \

	(MXC91231_IS_MODULE(x, L2CC) ? MXC91231_L2CC_IO_ADDRESS(x) : \

	 MXC91231_IS_MODULE(x, AIPS1) ? MXC91231_AIPS1_IO_ADDRESS(x) : \

	 MXC91231_IS_MODULE(x, AIPS2) ? MXC91231_AIPS2_IO_ADDRESS(x) : \

	 MXC91231_IS_MODULE(x, SPBA0) ? MXC91231_SPBA0_IO_ADDRESS(x) : \

	 MXC91231_IS_MODULE(x, SPBA1) ? MXC91231_SPBA1_IO_ADDRESS(x) : \

	 MXC91231_IS_MODULE(x, ROMP) ? MXC91231_ROMP_IO_ADDRESS(x) : \

	 MXC91231_IS_MODULE(x, AVIC) ? MXC91231_AVIC_IO_ADDRESS(x) : \

	 MXC91231_IS_MODULE(x, X_MEMC) ? MXC91231_X_MEMC_IO_ADDRESS(x) : \

	 0xDEADBEEF)





/*

 * define the address mapping macros: in physical address order

 * it returns 0.

 */

#define MXC91231_L2CC_IO_ADDRESS(x)  \

	(((x) - MXC91231_L2CC_BASE_ADDR) + MXC91231_L2CC_BASE_ADDR_VIRT)



#define MXC91231_AIPS1_IO_ADDRESS(x)  \

	(((x) - MXC91231_AIPS1_BASE_ADDR) + MXC91231_AIPS1_BASE_ADDR_VIRT)



#define MXC91231_SPBA0_IO_ADDRESS(x)  \

	(((x) - MXC91231_SPBA0_BASE_ADDR) + MXC91231_SPBA0_BASE_ADDR_VIRT)



#define MXC91231_SPBA1_IO_ADDRESS(x)  \

	(((x) - MXC91231_SPBA1_BASE_ADDR) + MXC91231_SPBA1_BASE_ADDR_VIRT)



#define MXC91231_AIPS2_IO_ADDRESS(x)  \

	(((x) - MXC91231_AIPS2_BASE_ADDR) + MXC91231_AIPS2_BASE_ADDR_VIRT)



#define MXC91231_ROMP_IO_ADDRESS(x)  \

	(((x) - MXC91231_ROMP_BASE_ADDR) + MXC91231_ROMP_BASE_ADDR_VIRT)



#define MXC91231_AVIC_IO_ADDRESS(x)  \

	(((x) - MXC91231_AVIC_BASE_ADDR) + MXC91231_AVIC_BASE_ADDR_VIRT)



#define MXC91231_X_MEMC_IO_ADDRESS(x)  \

	(((x) - MXC91231_X_MEMC_BASE_ADDR) + MXC91231_X_MEMC_BASE_ADDR_VIRT)

#define MXC91231_IO_ADDRESS(x) (					\

	IMX_IO_ADDRESS(x, MXC91231_L2CC) ?:				\

	IMX_IO_ADDRESS(x, MXC91231_X_MEMC) ?:				\

	IMX_IO_ADDRESS(x, MXC91231_ROMP) ?:				\

	IMX_IO_ADDRESS(x, MXC91231_AVIC) ?:				\

	IMX_IO_ADDRESS(x, MXC91231_AIPS1) ?:				\

	IMX_IO_ADDRESS(x, MXC91231_SPBA0) ?:				\

	IMX_IO_ADDRESS(x, MXC91231_SPBA1) ?:				\

	IMX_IO_ADDRESS(x, MXC91231_AIPS2))



/*

 * Interrupt numbers