diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-12-16 13:06:12 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-08 10:41:26 -0500 |
commit | 1273e7686f0c122bf58592c57387471c7f4eaa1b (patch) | |
tree | bda9b03fdb443c6ddba8d78923fc14150776a991 /arch/arm/plat-mxc/include/mach/mx31.h | |
parent | bc9ea6c7f5352f8857525b054bc3df784be1b8d5 (diff) |
imx31: define and use MX31_IO_ADDRESS
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx31.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index b8b47d139eb5..0c005af2c8cf 100644 --- a/arch/arm/plat-mxc/include/mach/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h | |||
@@ -109,6 +109,13 @@ | |||
109 | 109 | ||
110 | #define MX31_PCMCIA_MEM_BASE_ADDR 0xbc000000 | 110 | #define MX31_PCMCIA_MEM_BASE_ADDR 0xbc000000 |
111 | 111 | ||
112 | #define MX31_IO_ADDRESS(x) ( \ | ||
113 | IMX_IO_ADDRESS(x, MX31_AIPS1) ?: \ | ||
114 | IMX_IO_ADDRESS(x, MX31_AIPS2) ?: \ | ||
115 | IMX_IO_ADDRESS(x, MX31_AVIC) ?: \ | ||
116 | IMX_IO_ADDRESS(x, MX31_X_MEMC) ?: \ | ||
117 | IMX_IO_ADDRESS(x, MX31_SPBA0)) | ||
118 | |||
112 | #define MX31_INT_I2C3 3 | 119 | #define MX31_INT_I2C3 3 |
113 | #define MX31_INT_I2C2 4 | 120 | #define MX31_INT_I2C2 4 |
114 | #define MX31_INT_MPEG4_ENCODER 5 | 121 | #define MX31_INT_MPEG4_ENCODER 5 |