From f1a3031c7bcad3d13c30af1416b8c6c38ef1ca21 Mon Sep 17 00:00:00 2001 From: Harry Fearnhamm Date: Tue, 16 May 2006 16:50:21 +0100 Subject: [PATCH] --- yaml --- r: 26748 b: refs/heads/master c: bb1a2aa617e67e2d60f22052b13422c7caeaf798 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-realview/realview_eb.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2440387ac251..8e24fb134f0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 +refs/heads/master: bb1a2aa617e67e2d60f22052b13422c7caeaf798 diff --git a/trunk/arch/arm/mach-realview/realview_eb.c b/trunk/arch/arm/mach-realview/realview_eb.c index d4a586e38d5b..693fb1e396e0 100644 --- a/trunk/arch/arm/mach-realview/realview_eb.c +++ b/trunk/arch/arm/mach-realview/realview_eb.c @@ -137,8 +137,11 @@ static struct amba_device *amba_devs[] __initdata = { static void __init gic_init_irq(void) { #ifdef CONFIG_REALVIEW_MPCORE + unsigned int pldctrl; writel(0x0000a05f, __io_address(REALVIEW_SYS_LOCK)); - writel(0x008003c0, __io_address(REALVIEW_SYS_BASE) + 0xd8); + pldctrl = readl(__io_address(REALVIEW_SYS_BASE) + 0xd8); + pldctrl |= 0x00800000; /* New irq mode */ + writel(pldctrl, __io_address(REALVIEW_SYS_BASE) + 0xd8); writel(0x00000000, __io_address(REALVIEW_SYS_LOCK)); #endif gic_dist_init(__io_address(REALVIEW_GIC_DIST_BASE));