ARM: shmobile: r8a7779: Use ioremap() to map INTC2 registers

Replace using the legacy IOMEM() macro to map various registers related
to INTC2 configuration by ioremap().

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20201117103022.2136527-3-geert+renesas@glider.be

diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 86406e3..07c1bc9 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -38,30 +38,36 @@ static void __init r8a7779_map_io(void)
        iotable_init(r8a7779_io_desc, ARRAY_SIZE(r8a7779_io_desc));
 }
 
+#define HPBREG_BASE    0xfe700000
+
 /* IRQ */
-#define INT2SMSKCR0 IOMEM(0xfe7822a0)
-#define INT2SMSKCR1 IOMEM(0xfe7822a4)
-#define INT2SMSKCR2 IOMEM(0xfe7822a8)
-#define INT2SMSKCR3 IOMEM(0xfe7822ac)
-#define INT2SMSKCR4 IOMEM(0xfe7822b0)
+#define INT2SMSKCR0    0x822a0 /* Interrupt Submask Clear Register 0 */
+#define INT2SMSKCR1    0x822a4 /* Interrupt Submask Clear Register 1 */
+#define INT2SMSKCR2    0x822a8 /* Interrupt Submask Clear Register 2 */
+#define INT2SMSKCR3    0x822ac /* Interrupt Submask Clear Register 3 */
+#define INT2SMSKCR4    0x822b0 /* Interrupt Submask Clear Register 4 */
 
-#define INT2NTSR0 IOMEM(0xfe700060)
-#define INT2NTSR1 IOMEM(0xfe700064)
+#define INT2NTSR0      0x00060 /* Interrupt Notification Select Register 0 */
+#define INT2NTSR1      0x00064 /* Interrupt Notification Select Register 1 */
 
 static void __init r8a7779_init_irq_dt(void)
 {
+       void __iomem *base = ioremap(HPBREG_BASE, 0x00100000);
+
        irqchip_init();
 
        /* route all interrupts to ARM */
-       __raw_writel(0xffffffff, INT2NTSR0);
-       __raw_writel(0x3fffffff, INT2NTSR1);
+       __raw_writel(0xffffffff, base + INT2NTSR0);
+       __raw_writel(0x3fffffff, base + INT2NTSR1);
 
        /* unmask all known interrupts in INTCS2 */
-       __raw_writel(0xfffffff0, INT2SMSKCR0);
-       __raw_writel(0xfff7ffff, INT2SMSKCR1);
-       __raw_writel(0xfffbffdf, INT2SMSKCR2);
-       __raw_writel(0xbffffffc, INT2SMSKCR3);
-       __raw_writel(0x003fee3f, INT2SMSKCR4);
+       __raw_writel(0xfffffff0, base + INT2SMSKCR0);
+       __raw_writel(0xfff7ffff, base + INT2SMSKCR1);
+       __raw_writel(0xfffbffdf, base + INT2SMSKCR2);
+       __raw_writel(0xbffffffc, base + INT2SMSKCR3);
+       __raw_writel(0x003fee3f, base + INT2SMSKCR4);
+
+       iounmap(base);
 }
 
 static const char *const r8a7779_compat_dt[] __initconst = {