diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-03-04 15:02:41 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-24 09:40:24 -0400 |
commit | 05a3185cad1bb4e1b2206fdca9041234c3662a25 (patch) | |
tree | 8ba67c86d4ab2b6d3f2318f3b32dce18b9b72f62 /arch/arm/mach-mx1/generic.c | |
parent | c10ea4d60eb387dac4d3011e40d5536eb7642a93 (diff) |
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 @@ | |||
31 | 31 | ||
32 | static struct map_desc imx_io_desc[] __initdata = { | 32 | static struct map_desc imx_io_desc[] __initdata = { |
33 | { | 33 | { |
34 | .virtual = IMX_IO_BASE, | 34 | .virtual = MX1_IO_BASE_ADDR_VIRT, |
35 | .pfn = __phys_to_pfn(IMX_IO_PHYS), | 35 | .pfn = __phys_to_pfn(MX1_IO_BASE_ADDR), |
36 | .length = IMX_IO_SIZE, | 36 | .length = MX1_IO_SIZE, |
37 | .type = MT_DEVICE | 37 | .type = MT_DEVICE |
38 | } | 38 | } |
39 | }; | 39 | }; |
40 | 40 | ||
41 | void __init mx1_map_io(void) | 41 | void __init mx1_map_io(void) |
42 | { | 42 | { |
43 | mxc_set_cpu_type(MXC_CPU_MX1); | 43 | mxc_set_cpu_type(MXC_CPU_MX1); |
44 | mxc_arch_reset_init(IO_ADDRESS(WDT_BASE_ADDR)); | 44 | mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); |
45 | 45 | ||
46 | iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc)); | 46 | iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc)); |
47 | } | 47 | } |
48 | 48 | ||
49 | void __init mx1_init_irq(void) | 49 | void __init mx1_init_irq(void) |
50 | { | 50 | { |
51 | mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR)); | 51 | mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR)); |
52 | } | 52 | } |
53 | |||