mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ramips: rt305x: rewrite SoC detection

Browse Source 
SVN-Revision: 30890
This commit is contained in:
Gabor Juhos 2012-03-11 19:05:59 +00:00
parent 8cf8ee8f9d
commit 05d3f559f5
3 changed files with 60 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h
View File

@ -16,6 +16,35 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
enum rt305x_soc_type {
RT305X_SOC_UNKNOWN = 0,
RT305X_SOC_RT3050,
RT305X_SOC_RT3052,
RT305X_SOC_RT3352,
};
extern enum rt305x_soc_type rt305x_soc;
static inline int soc_is_rt3050(void)
{
return rt305x_soc == RT305X_SOC_RT3050;
}
static inline int soc_is_rt3052(void)
{
return rt305x_soc == RT305X_SOC_RT3052;
}
static inline int soc_is_rt305x(void)
{
return soc_is_rt3050() || soc_is_rt3052();
}
static inline int soc_is_rt3352(void)
{
return rt305x_soc == RT305X_SOC_RT3352;
}
#define RT305X_MEM_SIZE_MIN (2 * 1024 * 1024) #define RT305X_MEM_SIZE_MIN (2 * 1024 * 1024)
#define RT305X_MEM_SIZE_MAX (64 * 1024 * 1024) #define RT305X_MEM_SIZE_MAX (64 * 1024 * 1024)

6
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h
View File

@ -57,6 +57,12 @@
#define SYSC_REG_IA_ADDRESS 0x310 /* Illegal Access Address */ #define SYSC_REG_IA_ADDRESS 0x310 /* Illegal Access Address */
#define SYSC_REG_IA_TYPE 0x314 /* Illegal Access Type */ #define SYSC_REG_IA_TYPE 0x314 /* Illegal Access Type */
#define RT3052_CHIP_NAME0 0x30335452
#define RT3052_CHIP_NAME1 0x20203235
#define RT3352_CHIP_NAME0 0x33335452
#define RT3352_CHIP_NAME1 0x20203235
#define CHIP_ID_ID_MASK 0xff #define CHIP_ID_ID_MASK 0xff
#define CHIP_ID_ID_SHIFT 8 #define CHIP_ID_ID_SHIFT 8
#define CHIP_ID_REV_MASK 0xff #define CHIP_ID_REV_MASK 0xff

30
target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
View File

@ -15,6 +15,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/mipsregs.h>
#include <asm/mach-ralink/common.h> #include <asm/mach-ralink/common.h>
#include <asm/mach-ralink/ramips_gpio.h> #include <asm/mach-ralink/ramips_gpio.h>
#include <asm/mach-ralink/rt305x.h> #include <asm/mach-ralink/rt305x.h>
@ -22,24 +24,42 @@
void __iomem * rt305x_sysc_base; void __iomem * rt305x_sysc_base;
void __iomem * rt305x_memc_base; void __iomem * rt305x_memc_base;
enum rt305x_soc_type rt305x_soc;
void __init ramips_soc_prom_init(void) void __init ramips_soc_prom_init(void)
{ {
void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE); void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
const char *name = "unknown";
u32 n0; u32 n0;
u32 n1; u32 n1;
u32 id; u32 id;
n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0); n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1); n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
if (n0 == RT3052_CHIP_NAME0 && n1 == RT3052_CHIP_NAME1) {
unsigned long icache_sets;
icache_sets = (read_c0_config1() >> 22) & 7;
if (icache_sets == 1) {
rt305x_soc = RT305X_SOC_RT3050;
name = "RT3050";
} else {
rt305x_soc = RT305X_SOC_RT3052;
name = "RT3052";
}
} else if (n0 == RT3352_CHIP_NAME0 && n1 == RT3352_CHIP_NAME1) {
rt305x_soc = RT305X_SOC_RT3352;
name = "RT3352";
} else {
panic("rt305x: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
}
id = __raw_readl(sysc + SYSC_REG_CHIP_ID); id = __raw_readl(sysc + SYSC_REG_CHIP_ID);
snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN, snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN,
"Ralink %c%c%c%c%c%c%c%c id:%u rev:%u", "Ralink %s id:%u rev:%u",
(char) (n0 & 0xff), (char) ((n0 >> 8) & 0xff), name,
(char) ((n0 >> 16) & 0xff), (char) ((n0 >> 24) & 0xff),
(char) (n1 & 0xff), (char) ((n1 >> 8) & 0xff),
(char) ((n1 >> 16) & 0xff), (char) ((n1 >> 24) & 0xff),
(id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK, (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
(id & CHIP_ID_REV_MASK)); (id & CHIP_ID_REV_MASK));