mips: ralink: rt288x: define RT2880_SYSC_BASE with __iomem

 So that RT2880_SYSC_BASE can be used later in multiple functions without
 needing to repeat this __iomem declaration each time

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/include/asm/mach-ralink/rt288x.h
index 5f213534f0f50de01ea0132993d28670c977b649..66a999cd1d8002a0b924a11c962ecad140509f15 100644 (file)
--- a/arch/mips/include/asm/mach-ralink/rt288x.h
+++ b/arch/mips/include/asm/mach-ralink/rt288x.h
@@ -11,7 +11,8 @@
 #ifndef _RT288X_REGS_H_
 #define _RT288X_REGS_H_
 
-#define RT2880_SYSC_BASE               0x00300000
+#define IOMEM(x)                       ((void __iomem *)(KSEG1ADDR(x)))
+#define RT2880_SYSC_BASE               IOMEM(0x00300000)
 
 #define SYSC_REG_CHIP_NAME0            0x00
 #define SYSC_REG_CHIP_NAME1            0x04

diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c
index 493335db2fe15bc9667d4da3645b42023242b744..12f339138c4cf3d6532e5a7776295ca81567fa46 100644 (file)
--- a/arch/mips/ralink/rt288x.c
+++ b/arch/mips/ralink/rt288x.c
@@ -59,15 +59,14 @@ void __init ralink_of_remap(void)
 
 void __init prom_soc_init(struct ralink_soc_info *soc_info)
 {
-       void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT2880_SYSC_BASE);
        const char *name;
        u32 n0;
        u32 n1;
        u32 id;
 
-       n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
-       n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
-       id = __raw_readl(sysc + SYSC_REG_CHIP_ID);
+       n0 = __raw_readl(RT2880_SYSC_BASE + SYSC_REG_CHIP_NAME0);
+       n1 = __raw_readl(RT2880_SYSC_BASE + SYSC_REG_CHIP_NAME1);
+       id = __raw_readl(RT2880_SYSC_BASE + SYSC_REG_CHIP_ID);
 
        if (n0 == RT2880_CHIP_NAME0 && n1 == RT2880_CHIP_NAME1) {
                soc_info->compatible = "ralink,r2880-soc";