diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-12-16 19:08:09 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-08 16:45:19 +0100 |
| commit | 59e2608169bf4199f9f9e08a8abe80132e9416f5 (patch) | |
| tree | 858e252c7e041c3df10d4023bda459f4448c3679 /arch/arm/mach-mx3 | |
| parent | 6ef9af6871e3f220c6c7facf90babe6931d972bd (diff) | |
| download | kernel_samsung_smdk4412-59e2608169bf4199f9f9e08a8abe80132e9416f5.zip kernel_samsung_smdk4412-59e2608169bf4199f9f9e08a8abe80132e9416f5.tar.gz kernel_samsung_smdk4412-59e2608169bf4199f9f9e08a8abe80132e9416f5.tar.bz2 | |
mx3/kzm_arm11_01: define and use board specific IO_ADDRESS macro
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>
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/mach-kzm_arm11_01.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c index 2850b0b..2484ddd 100644 --- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c +++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c @@ -46,13 +46,18 @@ #include "devices.h" +#define KZM_ARM11_IO_ADDRESS(x) ( \ + IMX_IO_ADDRESS(x, MX31_CS4) ?: \ + IMX_IO_ADDRESS(x, MX31_CS5) ?: \ + MX31_IO_ADDRESS(x)) + #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) /* * KZM-ARM11-01 has an external UART on FPGA */ static struct plat_serial8250_port serial_platform_data[] = { { - .membase = IO_ADDRESS(KZM_ARM11_16550), + .membase = KZM_ARM11_IO_ADDRESS(KZM_ARM11_16550), .mapbase = KZM_ARM11_16550, .irq = IOMUX_TO_IRQ(MX31_PIN_GPIO1_1), .irqflags = IRQ_TYPE_EDGE_RISING, @@ -102,9 +107,9 @@ static int __init kzm_init_ext_uart(void) /* * Unmask UART interrupt */ - tmp = __raw_readb(IO_ADDRESS(KZM_ARM11_CTL1)); + tmp = __raw_readb(KZM_ARM11_IO_ADDRESS(KZM_ARM11_CTL1)); tmp |= 0x2; - __raw_writeb(tmp, IO_ADDRESS(KZM_ARM11_CTL1)); + __raw_writeb(tmp, KZM_ARM11_IO_ADDRESS(KZM_ARM11_CTL1)); return platform_device_register(&serial_device); } |