diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-02-01 17:29:57 -0200 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-24 12:16:00 +0200 |
| commit | d853de63d39096d43dc2fdbe494b8cd9cfe9a251 (patch) | |
| tree | 2696d8d31820fb740b8935d559b1bbebc3ab5f73 /arch/arm/mach-mx37 | |
| parent | a68365507942861ae2ce9e4dc4e225977a96f15f (diff) | |
ENGR00120394-2 imx: make tzic use dynamic base address
Different chips have TZIC interrupt controller at different addresses,
so make the mapping dynamic.
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/mach-mx37')
| -rw-r--r-- | arch/arm/mach-mx37/devices.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-mx37/mx37_3stack.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-mx37/devices.c b/arch/arm/mach-mx37/devices.c index ecc6ebf2eeea..6c7d5e9726d5 100644 --- a/arch/arm/mach-mx37/devices.c +++ b/arch/arm/mach-mx37/devices.c @@ -22,6 +22,7 @@ #include <linux/iram_alloc.h> #include <mach/gpio.h> +#include <mach/common.h> #include <mach/hardware.h> #include <mach/mxc_dptc.h> #include <mach/mxc_dvfs.h> @@ -1056,6 +1057,11 @@ int __init mxc_init_srpgconfig(void) return 0; } +void __init mx37_init_irq(void) +{ + mxc_tzic_init_irq(TZIC_BASE_ADDR); +} + int __init mxc_init_devices(void) { mxc_init_wdt(); diff --git a/arch/arm/mach-mx37/mx37_3stack.c b/arch/arm/mach-mx37/mx37_3stack.c index 9987c89596a5..4d6d8718ae2e 100644 --- a/arch/arm/mach-mx37/mx37_3stack.c +++ b/arch/arm/mach-mx37/mx37_3stack.c @@ -960,7 +960,7 @@ MACHINE_START(MX37_3DS, "Freescale MX37 3-Stack Board") .boot_params = PHYS_OFFSET + 0x100, .fixup = fixup_mxc_board, .map_io = mx37_map_io, - .init_irq = mxc_init_irq, + .init_irq = mx37_init_irq, .init_machine = mxc_board_init, .timer = &mxc_timer, MACHINE_END |