diff options
author | Colin Cross <ccross@android.com> | 2010-10-04 18:22:56 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:35:59 -0800 |
commit | dbe0cd38cbe40e797683d01e5df50470a9087174 (patch) | |
tree | 5c8870b7ceddced87efd795f4386b5451c43f253 /arch/arm/mach-tegra/fiq.c | |
parent | 3fc246763fd175cc2f3cc4043e7a7cd9d32f863c (diff) |
[ARM] tegra: Combine tegra_fiq_select with enable/disable
Change-Id: Iba3dc43e1a95993a6278eea008c7a8610ed0cd4c
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-tegra/fiq.c')
-rw-r--r-- | arch/arm/mach-tegra/fiq.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/fiq.c b/arch/arm/mach-tegra/fiq.c index 81f573b1a1dc..d5470169b553 100644 --- a/arch/arm/mach-tegra/fiq.c +++ b/arch/arm/mach-tegra/fiq.c @@ -39,15 +39,12 @@ void tegra_fiq_enable(int irq) val &= ~8; /* pass FIQs through */ val |= 2; /* enableNS */ writel(val, base + GIC_CPU_CTRL); + tegra_legacy_select_fiq(irq, true); tegra_legacy_unmask_irq(irq); } void tegra_fiq_disable(int irq) { tegra_legacy_mask_irq(irq); -} - -void tegra_fiq_select(int irq, int on) -{ - tegra_legacy_select_fiq(irq, !!on); + tegra_legacy_select_fiq(irq, false); } |