diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-03-04 21:02:41 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-24 15:40:24 +0200 |
| commit | 05a3185cad1bb4e1b2206fdca9041234c3662a25 (patch) | |
| tree | 8ba67c86d4ab2b6d3f2318f3b32dce18b9b72f62 /arch/arm/mach-mx1/generic.c | |
| parent | ARM: mx25: rename mach-mx25pdk.c to mach-mx25_3ds.c matching its arch number (diff) | |
| download | linux-05a3185cad1bb4e1b2206fdca9041234c3662a25.tar.xz linux-05a3185cad1bb4e1b2206fdca9041234c3662a25.zip | |
ARM: mx1: don't use deprecated symbol names
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx1/generic.c')
| -rw-r--r-- | arch/arm/mach-mx1/generic.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-mx1/generic.c b/arch/arm/mach-mx1/generic.c index 7f9fc1034c08..5a745d99e660 100644 --- a/arch/arm/mach-mx1/generic.c +++ b/arch/arm/mach-mx1/generic.c @@ -31,23 +31,22 @@ static struct map_desc imx_io_desc[] __initdata = { { - .virtual = IMX_IO_BASE, - .pfn = __phys_to_pfn(IMX_IO_PHYS), - .length = IMX_IO_SIZE, - .type = MT_DEVICE + .virtual = MX1_IO_BASE_ADDR_VIRT, + .pfn = __phys_to_pfn(MX1_IO_BASE_ADDR), + .length = MX1_IO_SIZE, + .type = MT_DEVICE } }; void __init mx1_map_io(void) { mxc_set_cpu_type(MXC_CPU_MX1); - mxc_arch_reset_init(IO_ADDRESS(WDT_BASE_ADDR)); + mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc)); } void __init mx1_init_irq(void) { - mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR)); + mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR)); } - |