diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx5/board-mx53_ard.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v1.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_ard.c b/arch/arm/mach-mx5/board-mx53_ard.c index 5f224f1c3eb6..d4aac813cca8 100644 --- a/arch/arm/mach-mx5/board-mx53_ard.c +++ b/arch/arm/mach-mx5/board-mx53_ard.c | |||
@@ -189,8 +189,10 @@ static int weim_cs_config(void) | |||
189 | return -ENOMEM; | 189 | return -ENOMEM; |
190 | 190 | ||
191 | iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K); | 191 | iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K); |
192 | if (!iomuxc_base) | 192 | if (!iomuxc_base) { |
193 | iounmap(weim_base); | ||
193 | return -ENOMEM; | 194 | return -ENOMEM; |
195 | } | ||
194 | 196 | ||
195 | /* CS1 timings for LAN9220 */ | 197 | /* CS1 timings for LAN9220 */ |
196 | writel(0x20001, (weim_base + 0x18)); | 198 | writel(0x20001, (weim_base + 0x18)); |
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v1.h b/arch/arm/plat-mxc/include/mach/iomux-v1.h index 6fa8a707b9a0..f7d18046c04f 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v1.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v1.h | |||
@@ -96,6 +96,6 @@ extern int mxc_gpio_mode(int gpio_mode); | |||
96 | extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, | 96 | extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, |
97 | const char *label); | 97 | const char *label); |
98 | 98 | ||
99 | extern int __init imx_iomuxv1_init(void __iomem *base, int numports); | 99 | extern int imx_iomuxv1_init(void __iomem *base, int numports); |
100 | 100 | ||
101 | #endif /* __MACH_IOMUX_V1_H__ */ | 101 | #endif /* __MACH_IOMUX_V1_H__ */ |