diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-06-04 05:16:22 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-14 06:40:41 -0400 |
commit | 6134b2cbb0e24f897fd1063745638397809fca29 (patch) | |
tree | 2e985b582459fd56cb260e02ea8399d175923e9c /arch/arm/mach-mx3/mm.c | |
parent | fc2a9f0bc7f6dd4966dc57fb98b8697c83b6d035 (diff) |
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/mm.c')
-rw-r--r-- | arch/arm/mach-mx3/mm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c index c327172159c0..ad5a1122d765 100644 --- a/arch/arm/mach-mx3/mm.c +++ b/arch/arm/mach-mx3/mm.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include <mach/common.h> | 31 | #include <mach/common.h> |
32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
33 | #include <mach/iomux-v3.h> | ||
33 | 34 | ||
34 | /*! | 35 | /*! |
35 | * @file mm.c | 36 | * @file mm.c |
@@ -83,6 +84,7 @@ void __init mx31_map_io(void) | |||
83 | void __init mx35_map_io(void) | 84 | void __init mx35_map_io(void) |
84 | { | 85 | { |
85 | mxc_set_cpu_type(MXC_CPU_MX35); | 86 | mxc_set_cpu_type(MXC_CPU_MX35); |
87 | mxc_iomux_v3_init(IO_ADDRESS(IOMUXC_BASE_ADDR)); | ||
86 | mxc_arch_reset_init(IO_ADDRESS(WDOG_BASE_ADDR)); | 88 | mxc_arch_reset_init(IO_ADDRESS(WDOG_BASE_ADDR)); |
87 | 89 | ||
88 | iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc)); | 90 | iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc)); |