ramips: introduce ramips_soc_prom_init and move SoC detection into that

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / arch / mips / ralink / rt3883 / rt3883.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt3883/rt3883.c b/target/linux/ramips/files/arch/mips/ralink/rt3883/rt3883.c
index 6e75b390f8c8d8390676a93e53064025f866ba72..8f5994892e6e9600370a9221736de2ea8368740a 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt3883/rt3883.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt3883/rt3883.c
@@ -22,15 +22,16 @@
 void __iomem * rt3883_sysc_base;
 void __iomem * rt3883_memc_base;
 
-void __init rt3883_detect_sys_type(void)
+void __init ramips_soc_prom_init(void)
 {
+       void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT3883_SYSC_BASE);
        u32 n0;
        u32 n1;
        u32 id;
 
-       n0 = rt3883_sysc_rr(RT3883_SYSC_REG_CHIPID0_3);
-       n1 = rt3883_sysc_rr(RT3883_SYSC_REG_CHIPID4_7);
-       id = rt3883_sysc_rr(RT3883_SYSC_REG_REVID);
+       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);
 
        snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN,
                "Ralink %c%c%c%c%c%c%c%c ver:%u eco:%u",