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/imx31.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/imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/imx31.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx31.c b/arch/arm/mach-imx/imx31.c index 2a9fe6ecae..71b4c333c0 100644 --- a/arch/arm/mach-imx/imx31.c +++ b/arch/arm/mach-imx/imx31.c @@ -31,6 +31,7 @@ static int imx31_init(void) add_generic_device("imx_iim", 0, NULL, MX31_IIM_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL); + add_generic_device("imx31-iomux", 0, NULL, MX31_IOMUXC_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx31-ccm", 0, NULL, MX31_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx31-gpt", 0, NULL, MX31_GPT1_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL); add_generic_device("imx-gpio", 0, NULL, MX31_GPIO1_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); |