From 9fb8ca891c66f6f2eff5d3003c9ca3b306fb062a Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 11 Mar 2012 19:05:53 +0000 Subject: ramips: introduce ramips_soc_prom_init and move SoC detection into that git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30887 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c | 9 +++++---- target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/ramips/files/arch/mips/ralink/rt288x') diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c index 53b1a6911..633e83d8c 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c @@ -23,15 +23,16 @@ void __iomem * rt288x_sysc_base; void __iomem * rt288x_memc_base; -void __init rt288x_detect_sys_type(void) +void __init ramips_soc_prom_init(void) { + void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT2880_SYSC_BASE); u32 n0; u32 n1; u32 id; - n0 = rt288x_sysc_rr(SYSC_REG_CHIP_NAME0); - n1 = rt288x_sysc_rr(SYSC_REG_CHIP_NAME1); - id = rt288x_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", diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c index 65e187d3a..be474b529 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c @@ -52,7 +52,6 @@ void __init ramips_soc_setup(void) rt288x_sysc_base = ioremap_nocache(RT2880_SYSC_BASE, RT2880_SYSC_SIZE); rt288x_memc_base = ioremap_nocache(RT2880_MEMC_BASE, RT2880_MEMC_SIZE); - rt288x_detect_sys_type(); rt288x_clocks_init(); clk = clk_get(NULL, "cpu"); -- cgit v1.2.3