mips: ralink: rt3883: define RT3883_SYSC_BASE with __iomem

So that RT3883_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/rt3883.h b/arch/mips/include/asm/mach-ralink/rt3883.h
index f250de9c055bfea2d2ef9ccb02b14e3531362e4f..ad25d5e8d2dc0f1198cafcb17d79d43e380b1b0e 100644 (file)
--- a/arch/mips/include/asm/mach-ralink/rt3883.h
+++ b/arch/mips/include/asm/mach-ralink/rt3883.h
@@ -10,8 +10,10 @@
 
 #include <linux/bitops.h>
 
+#define IOMEM(x)               ((void __iomem *)(KSEG1ADDR(x)))
+
 #define RT3883_SDRAM_BASE      0x00000000
-#define RT3883_SYSC_BASE       0x10000000
+#define RT3883_SYSC_BASE       IOMEM(0x10000000)
 #define RT3883_TIMER_BASE      0x10000100
 #define RT3883_INTC_BASE       0x10000200
 #define RT3883_MEMC_BASE       0x10000300

diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
index d9875f146d663e22fe66c72387282157b2088140..fa215c07558dd1eaf6df3578976530a3634305d8 100644 (file)
--- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c
@@ -72,15 +72,14 @@ void __init ralink_of_remap(void)
 
 void __init prom_soc_init(struct ralink_soc_info *soc_info)
 {
-       void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT3883_SYSC_BASE);
        const char *name;
        u32 n0;
        u32 n1;
        u32 id;
 
-       n0 = __raw_readl(sysc + RT3883_SYSC_REG_CHIPID0_3);
-       n1 = __raw_readl(sysc + RT3883_SYSC_REG_CHIPID4_7);
-       id = __raw_readl(sysc + RT3883_SYSC_REG_REVID);
+       n0 = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID0_3);
+       n1 = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID4_7);
+       id = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_REVID);
 
        if (n0 == RT3883_CHIP_NAME0 && n1 == RT3883_CHIP_NAME1) {
                soc_info->compatible = "ralink,rt3883-soc";