aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mti-sead3
diff options
context:
space:
mode:
authorAndrew Bresticker <abrestic@chromium.org>2014-10-20 15:03:50 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-11-24 01:44:58 -0500
commit327b8c89d4aec9871626415868c8312b9722f2b8 (patch)
treed1827865e4b7c8c963f61473e4269405709485fa /arch/mips/mti-sead3
parent387904ff84caeeff5aa5aad43aef4d0e5ce4bb24 (diff)
MIPS: SEAD3: Stop using GIC REG macros
Stop using the REG macros from gic.h and instead use proper iomem accessors. Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Qais Yousef <qais.yousef@imgtec.com> Cc: John Crispin <blogic@openwrt.org> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/8125/ Patchwork: https://patchwork.linux-mips.org/patch/8228/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mti-sead3')
-rw-r--r--arch/mips/mti-sead3/sead3-int.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/mti-sead3/sead3-int.c b/arch/mips/mti-sead3/sead3-int.c
index 69ae185a76c5..02bf0dba1127 100644
--- a/arch/mips/mti-sead3/sead3-int.c
+++ b/arch/mips/mti-sead3/sead3-int.c
@@ -20,16 +20,16 @@
20#define SEAD_CONFIG_BASE 0x1b100110 20#define SEAD_CONFIG_BASE 0x1b100110
21#define SEAD_CONFIG_SIZE 4 21#define SEAD_CONFIG_SIZE 4
22 22
23static unsigned long sead3_config_reg; 23static void __iomem *sead3_config_reg;
24 24
25void __init arch_init_irq(void) 25void __init arch_init_irq(void)
26{ 26{
27 if (!cpu_has_veic) 27 if (!cpu_has_veic)
28 mips_cpu_irq_init(); 28 mips_cpu_irq_init();
29 29
30 sead3_config_reg = (unsigned long)ioremap_nocache(SEAD_CONFIG_BASE, 30 sead3_config_reg = ioremap_nocache(SEAD_CONFIG_BASE, SEAD_CONFIG_SIZE);
31 SEAD_CONFIG_SIZE); 31 gic_present = (__raw_readl(sead3_config_reg) &
32 gic_present = (REG32(sead3_config_reg) & SEAD_CONFIG_GIC_PRESENT_MSK) >> 32 SEAD_CONFIG_GIC_PRESENT_MSK) >>
33 SEAD_CONFIG_GIC_PRESENT_SHF; 33 SEAD_CONFIG_GIC_PRESENT_SHF;
34 pr_info("GIC: %spresent\n", (gic_present) ? "" : "not "); 34 pr_info("GIC: %spresent\n", (gic_present) ? "" : "not ");
35 pr_info("EIC: %s\n", 35 pr_info("EIC: %s\n",