Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e963864 authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents d8c4cd74 945f82f2

arch/arm/mach-mx5/board-mx53_ard.c

+3 −1
Original line number Diff line number Diff line
@@ -189,8 +189,10 @@ static int weim_cs_config(void) 
		return -ENOMEM;



	iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K);

	if (!iomuxc_base)

	if (!iomuxc_base) {

		iounmap(weim_base);

		return -ENOMEM;

	}



	/* CS1 timings for LAN9220 */

	writel(0x20001, (weim_base + 0x18));

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

		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__ */