diff options
| author | Marcus Danielsson <marcus.danielsson@stericsson.com> | 2011-10-13 11:00:56 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:27 +0200 |
| commit | cb789b40a4e917df7652407dcb0fa270ebfaca83 (patch) | |
| tree | 2c909b6b26e6ffe2d77fef9e0bdb604613cd6dc6 | |
| parent | 963ed45d034cb026689f6d2df6b2c1e5b5a929e6 (diff) | |
ux500: recouple gic on boot
On WD reboot gic is in some cases decoupled.
ST-Ericsson ID: 364267
Change-Id: Ie818710839a2aad674d93e20fbc5562ce44b4bc5
Signed-off-by: Marcus Danielsson <marcus.danielsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33898
Reviewed-by: QABUILD
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/cpu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 23dd8004933..b1d00ad7482 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -28,6 +28,7 @@ #include <mach/setup.h> #include <mach/devices.h> #include <mach/reboot_reasons.h> +#include <mach/pm.h> #include "clock.h" @@ -97,6 +98,12 @@ void __init ux500_init_irq(void) gic_init(0, 29, dist_base, cpu_base); /* + * On WD reboot gic is in some cases decoupled. + * This will make sure that the GIC is correctly configured. + */ + ux500_pm_gic_recouple(); + + /* * Init clocks here so that they are available for system timer * initialization. */ |