ramips: introduce ramips_soc_prom_init and move SoC detection into that

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
index 5916888f066ca37a9c71eb0206957e4eaed6fad7..fa0d0f6cc08b987b9ada7a2f7a37f87e64e7ad4b 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
@@ -23,15 +23,16 @@
 void __iomem * rt305x_sysc_base;
 void __iomem * rt305x_memc_base;
 
-void __init rt305x_detect_sys_type(void)
+void __init ramips_soc_prom_init(void)
 {
+       void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
        u32 n0;
        u32 n1;
        u32 id;
 
-       n0 = rt305x_sysc_rr(SYSC_REG_CHIP_NAME0);
-       n1 = rt305x_sysc_rr(SYSC_REG_CHIP_NAME1);
-       id = rt305x_sysc_rr(SYSC_REG_CHIP_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);
 
        snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN,
                "Ralink %c%c%c%c%c%c%c%c id:%u rev:%u",