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/mach-mx1ads.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/mach-mx1ads.c')
-rw-r--r-- | arch/arm/mach-mx1/mach-mx1ads.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-mx1/mach-mx1ads.c b/arch/arm/mach-mx1/mach-mx1ads.c index 51f3cfd83db2..27c8222092af 100644 --- a/arch/arm/mach-mx1/mach-mx1ads.c +++ b/arch/arm/mach-mx1/mach-mx1ads.c | |||
@@ -75,8 +75,8 @@ static struct physmap_flash_data mx1ads_flash_data = { | |||
75 | }; | 75 | }; |
76 | 76 | ||
77 | static struct resource flash_resource = { | 77 | static struct resource flash_resource = { |
78 | .start = IMX_CS0_PHYS, | 78 | .start = MX1_CS0_PHYS, |
79 | .end = IMX_CS0_PHYS + SZ_32M - 1, | 79 | .end = MX1_CS0_PHYS + SZ_32M - 1, |
80 | .flags = IORESOURCE_MEM, | 80 | .flags = IORESOURCE_MEM, |
81 | }; | 81 | }; |
82 | 82 | ||
@@ -145,8 +145,8 @@ struct sys_timer mx1ads_timer = { | |||
145 | 145 | ||
146 | MACHINE_START(MX1ADS, "Freescale MX1ADS") | 146 | MACHINE_START(MX1ADS, "Freescale MX1ADS") |
147 | /* Maintainer: Sascha Hauer, Pengutronix */ | 147 | /* Maintainer: Sascha Hauer, Pengutronix */ |
148 | .phys_io = IMX_IO_PHYS, | 148 | .phys_io = MX1_IO_BASE_ADDR, |
149 | .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, | 149 | .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc, |
150 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 150 | .boot_params = MX1_PHYS_OFFSET + 0x100, |
151 | .map_io = mx1_map_io, | 151 | .map_io = mx1_map_io, |
152 | .init_irq = mx1_init_irq, | 152 | .init_irq = mx1_init_irq, |
@@ -155,8 +155,8 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS") | |||
155 | MACHINE_END | 155 | MACHINE_END |
156 | 156 | ||
157 | MACHINE_START(MXLADS, "Freescale MXLADS") | 157 | MACHINE_START(MXLADS, "Freescale MXLADS") |
158 | .phys_io = IMX_IO_PHYS, | 158 | .phys_io = MX1_IO_BASE_ADDR, |
159 | .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, | 159 | .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc, |
160 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 160 | .boot_params = MX1_PHYS_OFFSET + 0x100, |
161 | .map_io = mx1_map_io, | 161 | .map_io = mx1_map_io, |
162 | .init_irq = mx1_init_irq, | 162 | .init_irq = mx1_init_irq, |