diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2012-02-01 15:49:06 -0800 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-22 18:29:48 +0530 |
| commit | 513162b825d2034cbfcd6623ce9537caf69d270c (patch) | |
| tree | 4c65845a41b532e2249429887d48ee8ae8545292 /arch/arm/mach-tegra/irq.c | |
| parent | 538405c18faf3954d31ccaa5424547e6c590beb1 (diff) | |
ARM: tegra: Co-locate all GIC functions
Move Tegra GIC initialization to be with the other GIC functions.
Change-Id: I1d0af10724886588b74a7b7633a112d78aa54a53
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/78844
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Robert Bond <rbond@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Jeff Smith <jsmith@nvidia.com>
Reviewed-by: Jin Qian <jqian@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/irq.c')
| -rw-r--r-- | arch/arm/mach-tegra/irq.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 1aad5dcb06fb..cadd2b5e9054 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c @@ -198,13 +198,10 @@ subsys_initcall(tegra_legacy_irq_syscore_init); #define tegra_set_wake NULL #endif -void __iomem *tegra_gic_cpu_base; - void __init tegra_init_irq(void) { int i; void __iomem *distbase; - u32 midr; distbase = IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE); num_ictlrs = readl_relaxed(distbase + GIC_DIST_CTR) & 0x1f; @@ -231,19 +228,7 @@ void __init tegra_init_irq(void) gic_arch_extn.irq_set_wake = tegra_set_wake; gic_arch_extn.flags = IRQCHIP_MASK_ON_SUSPEND; - __asm__("mrc p15, 0, %0, c0, c0, 0\n" : "=r" (midr)); - - if ((midr & 0x0000FFF0) == 0x0000C090) - tegra_gic_cpu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100); - else - tegra_gic_cpu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x2000); - - /* - * Check if there is a devicetree present, since the GIC will be - * initialized elsewhere under DT. - */ - if (!of_have_populated_dt()) - gic_init(0, 29, distbase, tegra_gic_cpu_base); + tegra_gic_init(); } void tegra_init_legacy_irq_cop(void) |