Skip to content

Commit

Permalink
MIPS: Move MIPS_GIC_IRQ_BASE into platform irq.h
Browse files Browse the repository at this point in the history
Define a generic MIPS_GIC_IRQ_BASE which should be suitable for all
current boards in <mach-generic/irq.h>.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-by: Qais Yousef <qais.yousef@imgtec.com>
Tested-by: Qais Yousef <qais.yousef@imgtec.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Jeffrey Deans <jeffrey.deans@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7808/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Andrew Bresticker authored and Ralf Baechle committed Nov 24, 2014
1 parent aa827b7 commit 8635233
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 6 additions & 0 deletions arch/mips/include/asm/mach-generic/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,10 @@

#endif /* CONFIG_IRQ_CPU */

#ifdef CONFIG_MIPS_GIC
#ifndef MIPS_GIC_IRQ_BASE
#define MIPS_GIC_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8)
#endif
#endif /* CONFIG_MIPS_GIC */

#endif /* __ASM_MACH_GENERIC_IRQ_H */
2 changes: 0 additions & 2 deletions arch/mips/include/asm/mips-boards/maltaint.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#ifndef _MIPS_MALTAINT_H
#define _MIPS_MALTAINT_H

#define MIPS_GIC_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8)

/*
* Interrupts 0..15 are used for Malta ISA compatible interrupts
*/
Expand Down
2 changes: 0 additions & 2 deletions arch/mips/include/asm/mips-boards/sead3int.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@
#define GIC_BASE_ADDR 0x1b1c0000
#define GIC_ADDRSPACE_SZ (128 * 1024)

#define MIPS_GIC_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8)

#endif /* !(_MIPS_SEAD3INT_H) */

0 comments on commit 8635233

Please sign in to comment.