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 | 8cff770eb35ddb48e62cf95e83c8f1777c8db56a (patch) | |
| tree | ecc826a5693467641fe73c9eac6c6d6551ddb874 /target/linux/ramips/files/arch/mips/ralink/rt3883 | |
| parent | 2149facb537a6f4a58dd773004d47ea2712544ac (diff) | |
| download | upstream-8cff770eb35ddb48e62cf95e83c8f1777c8db56a.tar.gz upstream-8cff770eb35ddb48e62cf95e83c8f1777c8db56a.tar.bz2 upstream-8cff770eb35ddb48e62cf95e83c8f1777c8db56a.zip | |
ramips: introduce ramips_soc_prom_init and move SoC detection into that
SVN-Revision: 30887
Diffstat (limited to 'target/linux/ramips/files/arch/mips/ralink/rt3883')
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/rt3883/rt3883.c | 9 | ||||
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/rt3883/setup.c | 1 |
2 files changed, 5 insertions, 5 deletions
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 6e75b390f8..8f5994892e 100644 --- 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", diff --git a/target/linux/ramips/files/arch/mips/ralink/rt3883/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt3883/setup.c index f4c7296fa4..6e037a7291 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt3883/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt3883/setup.c @@ -52,7 +52,6 @@ void __init ramips_soc_setup(void) rt3883_sysc_base = ioremap_nocache(RT3883_SYSC_BASE, PAGE_SIZE); rt3883_memc_base = ioremap_nocache(RT3883_MEMC_BASE, PAGE_SIZE); - rt3883_detect_sys_type(); rt3883_clocks_init(); clk = clk_get(NULL, "cpu"); |