From f7e9d535119e1a5d030867f3581261204ba637cd Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Wed, 1 Feb 2012 15:49:06 -0800 Subject: ARM: tegra: Co-locate all GIC functions Move Tegra GIC initialization to be with the other GIC functions. Change-Id: I9b23757d135f3a9062f21fccb816c745ce8add43 Signed-off-by: Scott Williams Reviewed-on: http://git-master/r/78829 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Krishna Reddy Reviewed-by: Mark Stadler Reviewed-by: Aleksandr Frid Reviewed-by: Bharat Nihalani Reviewed-by: Varun Wadekar --- arch/arm/mach-tegra/gic.c | 8 +++++++- arch/arm/mach-tegra/gic.h | 4 +++- arch/arm/mach-tegra/irq.c | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-tegra/gic.c b/arch/arm/mach-tegra/gic.c index 50cecc4eed64..6c2dc9406758 100644 --- a/arch/arm/mach-tegra/gic.c +++ b/arch/arm/mach-tegra/gic.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011, NVIDIA Corporation + * Copyright (C) 2010-2012, NVIDIA Corporation * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -127,3 +127,9 @@ void tegra_gic_affinity_to_cpu0(void) } #endif #endif + +void __init tegra_gic_init(void) +{ + gic_init(0, 29, IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE), + IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100)); +} diff --git a/arch/arm/mach-tegra/gic.h b/arch/arm/mach-tegra/gic.h index 94dab6e581af..22bb85f18525 100644 --- a/arch/arm/mach-tegra/gic.h +++ b/arch/arm/mach-tegra/gic.h @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/include/mach/gic.h * - * Copyright (C) 2010-2011 NVIDIA Corporation + * Copyright (C) 2010-2012 NVIDIA Corporation * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -46,4 +46,6 @@ void tegra_gic_affinity_to_cpu0(void); #endif #endif +void __init tegra_gic_init(void); + #endif /* _MACH_TEGRA_GIC_H_ */ diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index e989d19a2fa4..450295d901dd 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c @@ -4,7 +4,7 @@ * Author: * Colin Cross * - * Copyright (C) 2010-2011, NVIDIA Corporation + * Copyright (C) 2010-2012, NVIDIA Corporation * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -29,6 +29,7 @@ #include #include "board.h" +#include "gic.h" #include "pm-irq.h" #define INT_SYS_NR (INT_GPIO_BASE - INT_PRI_BASE) @@ -209,8 +210,7 @@ void __init tegra_init_irq(void) gic_arch_extn.irq_set_wake = tegra_set_wake; gic_arch_extn.flags = IRQCHIP_MASK_ON_SUSPEND; - gic_init(0, 29, IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE), - IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100)); + tegra_gic_init(); } void tegra_init_legacy_irq_cop(void) -- cgit v1.2.3