From dd75071f4e094618fcb5ed182fbe3a47641d9739 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 29 Mar 2007 22:21:43 +0000 Subject: Cleanup system code and use definitions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6760 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../adm5120-2.6/files/arch/mips/adm5120/setup.c | 36 +++------------------- 1 file changed, 5 insertions(+), 31 deletions(-) (limited to 'target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c') diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c index 23e668411..1b99d7799 100644 --- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c +++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c @@ -14,17 +14,12 @@ #include #include +#include + #define ADM5120_SOFTRESET 0x12000004 #define STATUS_IE 0x00000001 #define ALLINTS (IE_IRQ0 | IE_IRQ5 | STATUS_IE) -#define ADM5120_CODEREG 0x12000000 -#define ADM5120_CPU_CLK_MASK 0x00300000 -#define ADM5120_CPU_CLK_175 0x00000000 -#define ADM5120_CPU_CLK_200 0x00100000 -#define ADM5120_CPU_CLK_225 0x00200000 -#define ADM5120_CPU_CLK_250 0x00300000 - void mips_time_init(void); extern unsigned int mips_counter_frequency; @@ -47,30 +42,9 @@ void adm5120_power_off(void) adm5120_halt(); } -void __init mips_time_init(void) +void __init adm5120_time_init(void) { - u32 clock; - - clock = *(u32*)KSEG1ADDR(ADM5120_CODEREG); - - switch (clock & ADM5120_CPU_CLK_MASK) { - case ADM5120_CPU_CLK_175: - mips_counter_frequency = 87500000; - printk("CPU clock: 175MHz\n"); - break; - case ADM5120_CPU_CLK_200: - mips_counter_frequency = 100000000; - printk("CPU clock: 200MHz\n"); - break; - case ADM5120_CPU_CLK_225: - mips_counter_frequency = 112500000; - printk("CPU clock: 225MHz\n"); - break; - case ADM5120_CPU_CLK_250: - mips_counter_frequency = 125000000; - printk("CPU clock: 250MHz\n"); - break; - } + mips_counter_frequency = adm5120_info.cpu_speed >> 1; } void __init plat_timer_setup(struct irqaction *irq) @@ -85,7 +59,7 @@ void __init plat_mem_setup(void) { printk(KERN_INFO "ADM5120 board setup\n"); - board_time_init = mips_time_init; + board_time_init = adm5120_time_init; //board_timer_setup = mips_timer_setup; _machine_restart = adm5120_restart; -- cgit v1.2.3