KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: introduce ramips_soc_prom_init and move SoC detection into that

Browse source 
SVN-Revision: 30887
This commit is contained in:
Gabor Juhos 2012-03-11 19:05:53 +00:00
parent 2149facb53
commit 8cff770eb3
11 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h
View file

@ -15,6 +15,7 @@ extern unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
void ramips_intc_irq_init(unsigned intc_base, unsigned irq, unsigned irq_base); void ramips_intc_irq_init(unsigned intc_base, unsigned irq, unsigned irq_base);
u32 ramips_intc_get_status(void); u32 ramips_intc_get_status(void);
void ramips_soc_prom_init(void);
void ramips_soc_setup(void); void ramips_soc_setup(void);
void ramips_early_serial_setup(int line, unsigned base, unsigned freq, void ramips_early_serial_setup(int line, unsigned base, unsigned freq,
unsigned irq); unsigned irq);

2
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
View file

@ -17,8 +17,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
void rt288x_detect_sys_type(void);
#define RT288X_CPU_IRQ_BASE 0 #define RT288X_CPU_IRQ_BASE 0
#define RT288X_INTC_IRQ_BASE 8 #define RT288X_INTC_IRQ_BASE 8
#define RT288X_INTC_IRQ_COUNT 32 #define RT288X_INTC_IRQ_COUNT 32

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

@ -16,8 +16,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
void rt305x_detect_sys_type(void);
#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)

2
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt3883.h
View file

@ -16,8 +16,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
void rt3883_detect_sys_type(void);
#define RT3883_MEM_SIZE_MIN (2 * 1024 * 1024) #define RT3883_MEM_SIZE_MIN (2 * 1024 * 1024)
#define RT3883_MEM_SIZE_MAX (256 * 1024 * 1024) #define RT3883_MEM_SIZE_MAX (256 * 1024 * 1024)

2
target/linux/ramips/files/arch/mips/ralink/common/prom.c
View file

@ -143,6 +143,8 @@ void __init prom_init(void)
char **envp; char **envp;
char **argv; char **argv;
ramips_soc_prom_init();
printk(KERN_DEBUG printk(KERN_DEBUG
"prom: fw_arg0=%08x, fw_arg1=%08x, fw_arg2=%08x, fw_arg3=%08x\n", "prom: fw_arg0=%08x, fw_arg1=%08x, fw_arg2=%08x, fw_arg3=%08x\n",
(unsigned int)fw_arg0, (unsigned int)fw_arg1, (unsigned int)fw_arg0, (unsigned int)fw_arg1,

9
target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c
View file

@ -23,15 +23,16 @@
void __iomem * rt288x_sysc_base; void __iomem * rt288x_sysc_base;
void __iomem * rt288x_memc_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 n0;
u32 n1; u32 n1;
u32 id; u32 id;
n0 = rt288x_sysc_rr(SYSC_REG_CHIP_NAME0); n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
n1 = rt288x_sysc_rr(SYSC_REG_CHIP_NAME1); n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
id = rt288x_sysc_rr(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 %c%c%c%c%c%c%c%c id:%u rev:%u",

1
target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
View file

@ -52,7 +52,6 @@ void __init ramips_soc_setup(void)
rt288x_sysc_base = ioremap_nocache(RT2880_SYSC_BASE, RT2880_SYSC_SIZE); rt288x_sysc_base = ioremap_nocache(RT2880_SYSC_BASE, RT2880_SYSC_SIZE);
rt288x_memc_base = ioremap_nocache(RT2880_MEMC_BASE, RT2880_MEMC_SIZE); rt288x_memc_base = ioremap_nocache(RT2880_MEMC_BASE, RT2880_MEMC_SIZE);
rt288x_detect_sys_type();
rt288x_clocks_init(); rt288x_clocks_init();
clk = clk_get(NULL, "cpu"); clk = clk_get(NULL, "cpu");

9
target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
View file

@ -23,15 +23,16 @@
void __iomem * rt305x_sysc_base; void __iomem * rt305x_sysc_base;
void __iomem * rt305x_memc_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 n0;
u32 n1; u32 n1;
u32 id; u32 id;
n0 = rt305x_sysc_rr(SYSC_REG_CHIP_NAME0); n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
n1 = rt305x_sysc_rr(SYSC_REG_CHIP_NAME1); n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
id = rt305x_sysc_rr(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 %c%c%c%c%c%c%c%c id:%u rev:%u",

1
target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
View file

@ -52,7 +52,6 @@ void __init ramips_soc_setup(void)
rt305x_sysc_base = ioremap_nocache(RT305X_SYSC_BASE, PAGE_SIZE); rt305x_sysc_base = ioremap_nocache(RT305X_SYSC_BASE, PAGE_SIZE);
rt305x_memc_base = ioremap_nocache(RT305X_MEMC_BASE, PAGE_SIZE); rt305x_memc_base = ioremap_nocache(RT305X_MEMC_BASE, PAGE_SIZE);
rt305x_detect_sys_type();
rt305x_clocks_init(); rt305x_clocks_init();
clk = clk_get(NULL, "cpu"); clk = clk_get(NULL, "cpu");

9
target/linux/ramips/files/arch/mips/ralink/rt3883/rt3883.c
View file

@ -22,15 +22,16 @@
void __iomem * rt3883_sysc_base; void __iomem * rt3883_sysc_base;
void __iomem * rt3883_memc_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 n0;
u32 n1; u32 n1;
u32 id; u32 id;
n0 = rt3883_sysc_rr(RT3883_SYSC_REG_CHIPID0_3); n0 = __raw_readl(sysc + RT3883_SYSC_REG_CHIPID0_3);
n1 = rt3883_sysc_rr(RT3883_SYSC_REG_CHIPID4_7); n1 = __raw_readl(sysc + RT3883_SYSC_REG_CHIPID4_7);
id = rt3883_sysc_rr(RT3883_SYSC_REG_REVID); id = __raw_readl(sysc + RT3883_SYSC_REG_REVID);
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 ver:%u eco:%u", "Ralink %c%c%c%c%c%c%c%c ver:%u eco:%u",

1
target/linux/ramips/files/arch/mips/ralink/rt3883/setup.c
View file

@ -52,7 +52,6 @@ void __init ramips_soc_setup(void)
rt3883_sysc_base = ioremap_nocache(RT3883_SYSC_BASE, PAGE_SIZE); rt3883_sysc_base = ioremap_nocache(RT3883_SYSC_BASE, PAGE_SIZE);
rt3883_memc_base = ioremap_nocache(RT3883_MEMC_BASE, PAGE_SIZE); rt3883_memc_base = ioremap_nocache(RT3883_MEMC_BASE, PAGE_SIZE);
rt3883_detect_sys_type();
rt3883_clocks_init(); rt3883_clocks_init();
clk = clk_get(NULL, "cpu"); clk = clk_get(NULL, "cpu");