summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-06-04 11:16:22 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-08-14 12:40:41 +0200
commit6134b2cbb0e24f897fd1063745638397809fca29 (patch)
tree2e985b582459fd56cb260e02ea8399d175923e9c /arch/arm/mach-mx3
parentfc2a9f0bc7f6dd4966dc57fb98b8697c83b6d035 (diff)
downloadlinux-3.10-6134b2cbb0e24f897fd1063745638397809fca29.tar.gz
linux-3.10-6134b2cbb0e24f897fd1063745638397809fca29.tar.bz2
linux-3.10-6134b2cbb0e24f897fd1063745638397809fca29.zip
iomux-v3: Allow for a runtime base address
also, check for a valid pad_ctrl_ofs before changing the pad control register. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/mm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c
index c327172159c..ad5a1122d76 100644
--- a/arch/arm/mach-mx3/mm.c
+++ b/arch/arm/mach-mx3/mm.c
@@ -30,6 +30,7 @@
#include <mach/common.h>
#include <mach/hardware.h>
+#include <mach/iomux-v3.h>
/*!
* @file mm.c
@@ -83,6 +84,7 @@ void __init mx31_map_io(void)
void __init mx35_map_io(void)
{
mxc_set_cpu_type(MXC_CPU_MX35);
+ mxc_iomux_v3_init(IO_ADDRESS(IOMUXC_BASE_ADDR));
mxc_arch_reset_init(IO_ADDRESS(WDOG_BASE_ADDR));
iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));