diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2012-02-01 15:49:06 -0800 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-03 05:54:16 -0800 |
| commit | f7e9d535119e1a5d030867f3581261204ba637cd (patch) | |
| tree | 4e85049165a632b064783d6c63907e35ae0dfec4 /arch/arm/mach-tegra/irq.c | |
| parent | ff11080bde456a889e1a2b536a87bad65e6bee7c (diff) | |
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 <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/78829
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Mark Stadler <mastadler@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/irq.c')
| -rw-r--r-- | arch/arm/mach-tegra/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 <ccross@android.com> * - * 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 <mach/legacy_irq.h> #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) |