diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:49:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:49:18 +0200 |
| commit | 09efce4ad3c08b89291cedffa054e03ef44f521a (patch) | |
| tree | 07e7d004f1962020401e62750597dfb4028f3af5 /arch/arm/mach-imx/imx1.c | |
| parent | e6f224a55358f3a979434457c78df8fd0303bdff (diff) | |
| parent | f36c7921091090996a9045142624c3b0c4a0160c (diff) | |
| download | barebox-09efce4ad3c08b89291cedffa054e03ef44f521a.tar.gz barebox-09efce4ad3c08b89291cedffa054e03ef44f521a.tar.xz | |
Merge branch 'for-next/imx-work' into for-next/imx
Conflicts:
arch/arm/mach-imx/imx1.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx1.c')
| -rw-r--r-- | arch/arm/mach-imx/imx1.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx1.c b/arch/arm/mach-imx/imx1.c index 7ac16fd818..966a8c2847 100644 --- a/arch/arm/mach-imx/imx1.c +++ b/arch/arm/mach-imx/imx1.c @@ -16,6 +16,7 @@ #include <io.h> #include <mach/imx-regs.h> #include <mach/weim.h> +#include <mach/iomux-v1.h> #include <reset_source.h> #define MX1_RSR MX1_SCM_BASE_ADDR @@ -50,6 +51,7 @@ void imx1_setup_eimcs(size_t cs, unsigned upper, unsigned lower) static int imx1_init(void) { + imx_iomuxv1_init((void *)MX1_GPIO1_BASE_ADDR); imx1_detect_reset_source(); add_generic_device("imx1-ccm", 0, NULL, MX1_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); |