diff options
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
-rw-r--r-- | arch/arm/mach-imx/mm-imx3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index f8ca96c354f2..d534d7f988e0 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c | |||
@@ -61,8 +61,8 @@ static void imx3_idle(void) | |||
61 | : "=r" (reg)); | 61 | : "=r" (reg)); |
62 | } | 62 | } |
63 | 63 | ||
64 | static void __iomem *imx3_ioremap(unsigned long phys_addr, size_t size, | 64 | static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size, |
65 | unsigned int mtype) | 65 | unsigned int mtype, void *caller) |
66 | { | 66 | { |
67 | if (mtype == MT_DEVICE) { | 67 | if (mtype == MT_DEVICE) { |
68 | /* | 68 | /* |
@@ -75,7 +75,7 @@ static void __iomem *imx3_ioremap(unsigned long phys_addr, size_t size, | |||
75 | mtype = MT_DEVICE_NONSHARED; | 75 | mtype = MT_DEVICE_NONSHARED; |
76 | } | 76 | } |
77 | 77 | ||
78 | return __arm_ioremap(phys_addr, size, mtype); | 78 | return __arm_ioremap_caller(phys_addr, size, mtype, caller); |
79 | } | 79 | } |
80 | 80 | ||
81 | void __init imx3_init_l2x0(void) | 81 | void __init imx3_init_l2x0(void) |
@@ -134,7 +134,7 @@ void __init imx31_init_early(void) | |||
134 | { | 134 | { |
135 | mxc_set_cpu_type(MXC_CPU_MX31); | 135 | mxc_set_cpu_type(MXC_CPU_MX31); |
136 | mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR)); | 136 | mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR)); |
137 | imx_ioremap = imx3_ioremap; | 137 | arch_ioremap_caller = imx3_ioremap_caller; |
138 | arm_pm_idle = imx3_idle; | 138 | arm_pm_idle = imx3_idle; |
139 | } | 139 | } |
140 | 140 | ||
@@ -208,7 +208,7 @@ void __init imx35_init_early(void) | |||
208 | mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); | 208 | mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); |
209 | mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); | 209 | mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); |
210 | arm_pm_idle = imx3_idle; | 210 | arm_pm_idle = imx3_idle; |
211 | imx_ioremap = imx3_ioremap; | 211 | arch_ioremap_caller = imx3_ioremap_caller; |
212 | } | 212 | } |
213 | 213 | ||
214 | void __init mx35_init_irq(void) | 214 | void __init mx35_init_irq(void) |