openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
  ARM: imx: iomux-v1.h: Fix build error due to __init annotation
This commit is contained in:
Olof Johansson 2012-01-26 23:15:11 -08:00
parent d8c4cd7463 945f82f25f
commit 5e96386431
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-mx5/board-mx53_ard.c
View File

@ -189,8 +189,10 @@ static int weim_cs_config(void)
return -ENOMEM; return -ENOMEM;
iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K); iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K);
if (!iomuxc_base) if (!iomuxc_base) {
iounmap(weim_base);
return -ENOMEM; return -ENOMEM;
}
/* CS1 timings for LAN9220 */ /* CS1 timings for LAN9220 */
writel(0x20001, (weim_base + 0x18)); writel(0x20001, (weim_base + 0x18));

2
arch/arm/plat-mxc/include/mach/iomux-v1.h
View File

@ -96,6 +96,6 @@ extern int mxc_gpio_mode(int gpio_mode);
extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
const char *label); const char *label);
extern int __init imx_iomuxv1_init(void __iomem *base, int numports); extern int imx_iomuxv1_init(void __iomem *base, int numports);
#endif /* __MACH_IOMUX_V1_H__ */ #endif /* __MACH_IOMUX_V1_H__ */