diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-11 19:05:53 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-11 19:05:53 +0000 |
| commit | ef72092022bd4d893ec52b662fd809f045933c67 (patch) | |
| tree | 118e6872dc0a7554fe29faba0ebfd5c06d9a2f58 /target/linux/ramips/files/arch/mips/ralink/rt305x | |
| parent | c1db1347f6f1b0dd17a89722fe5b82b66dbeb8e7 (diff) | |
| download | master-187ad058-ef72092022bd4d893ec52b662fd809f045933c67.tar.gz master-187ad058-ef72092022bd4d893ec52b662fd809f045933c67.tar.bz2 master-187ad058-ef72092022bd4d893ec52b662fd809f045933c67.zip | |
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
Diffstat (limited to 'target/linux/ramips/files/arch/mips/ralink/rt305x')
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c | 9 | ||||
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c | 1 |
2 files changed, 5 insertions, 5 deletions
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 5916888f06..fa0d0f6cc0 100644 --- 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", diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c index 6913006f7e..5a069db454 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c @@ -52,7 +52,6 @@ void __init ramips_soc_setup(void) rt305x_sysc_base = ioremap_nocache(RT305X_SYSC_BASE, PAGE_SIZE); rt305x_memc_base = ioremap_nocache(RT305X_MEMC_BASE, PAGE_SIZE); - rt305x_detect_sys_type(); rt305x_clocks_init(); clk = clk_get(NULL, "cpu"); |