diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/mach-mx1/generic.c | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/mach-mx1/generic.c')
| -rw-r--r-- | arch/arm/mach-mx1/generic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mx1/generic.c b/arch/arm/mach-mx1/generic.c index 7622c9b38c97..7f9fc1034c08 100644 --- a/arch/arm/mach-mx1/generic.c +++ b/arch/arm/mach-mx1/generic.c | |||
| @@ -41,6 +41,13 @@ static struct map_desc imx_io_desc[] __initdata = { | |||
| 41 | void __init mx1_map_io(void) | 41 | void __init mx1_map_io(void) |
| 42 | { | 42 | { |
| 43 | mxc_set_cpu_type(MXC_CPU_MX1); | 43 | mxc_set_cpu_type(MXC_CPU_MX1); |
| 44 | mxc_arch_reset_init(IO_ADDRESS(WDT_BASE_ADDR)); | ||
| 44 | 45 | ||
| 45 | iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc)); | 46 | iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc)); |
| 46 | } | 47 | } |
| 48 | |||
| 49 | void __init mx1_init_irq(void) | ||
| 50 | { | ||
| 51 | mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR)); | ||
| 52 | } | ||
| 53 | |||