Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / mach-shmobile / setup-r8a7778.c

diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 2bc93f3..02cda9c 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -14,6 +14,8 @@
 
 #include "common.h"
 
+#define HPBREG_BASE    0xfe700000
+
 #define INT2SMSKCR0    0x82288 /* 0xfe782288 */
 #define INT2SMSKCR1    0x8228c /* 0xfe78228c */
 
@@ -22,19 +24,19 @@
 
 static void __init r8a7778_init_irq_dt(void)
 {
-       void __iomem *base = ioremap(0xfe700000, 0x00100000);
+       void __iomem *base = ioremap(HPBREG_BASE, 0x00100000);
 
        BUG_ON(!base);
 
        irqchip_init();
 
        /* route all interrupts to ARM */
-       __raw_writel(0x73ffffff, base + INT2NTSR0);
-       __raw_writel(0xffffffff, base + INT2NTSR1);
+       writel(0x73ffffff, base + INT2NTSR0);
+       writel(0xffffffff, base + INT2NTSR1);
 
        /* unmask all known interrupts in INTCS2 */
-       __raw_writel(0x08330773, base + INT2SMSKCR0);
-       __raw_writel(0x00311110, base + INT2SMSKCR1);
+       writel(0x08330773, base + INT2SMSKCR0);
+       writel(0x00311110, base + INT2SMSKCR1);
 
        iounmap(base);
 }