diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-06-02 23:13:51 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-06-02 23:13:51 +0000 |
| commit | c879774b35a935881ad9780d355caa4d5c865336 (patch) | |
| tree | c9081be22be55413a04325741f898d3d05d34788 /target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c | |
| parent | a1e0545d4b44f8502dd4c3ee6537db2473344824 (diff) | |
| download | master-31e0f0ae-c879774b35a935881ad9780d355caa4d5c865336.tar.gz master-31e0f0ae-c879774b35a935881ad9780d355caa4d5c865336.tar.bz2 master-31e0f0ae-c879774b35a935881ad9780d355caa4d5c865336.zip | |
IRQ handler rewrite by Gabor Juhos, uses C no longer assembly
SVN-Revision: 7464
Diffstat (limited to 'target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c')
| -rw-r--r-- | target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c | 38 |
1 files changed, 10 insertions, 28 deletions
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 5767df8b23..aa30dc5c83 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 @@ -15,15 +15,13 @@ #include <asm/io.h> #include <asm/time.h> -#include <adm5120_info.h> +#include <asm/mach-adm5120/adm5120_info.h> +#include <asm/mach-adm5120/adm5120_defs.h> +#include <asm/mach-adm5120/adm5120_irq.h> -#define ADM5120_SOFTRESET 0x12000004 -#define STATUS_IE 0x00000001 -#define ALLINTS (IE_IRQ0 | IE_IRQ5 | STATUS_IE) - -void mips_time_init(void); +extern void adm5120_time_init(void) __init; -extern unsigned int mips_counter_frequency; +#define ADM5120_SOFTRESET 0x12000004 void adm5120_restart(char *command) { @@ -43,25 +41,11 @@ void adm5120_power_off(void) adm5120_halt(); } -void __init adm5120_time_init(void) -{ - mips_counter_frequency = adm5120_speed >> 1; -} - -void __init plat_timer_setup(struct irqaction *irq) -{ - /* to generate the first timer interrupt */ - write_c0_compare(read_c0_count()+ mips_counter_frequency/HZ); - clear_c0_status(ST0_BEV); - set_c0_status(ALLINTS); -} - void __init plat_mem_setup(void) { printk(KERN_INFO "ADM5120 board setup\n"); board_time_init = adm5120_time_init; - //board_timer_setup = mips_timer_setup; _machine_restart = adm5120_restart; _machine_halt = adm5120_halt; @@ -75,16 +59,15 @@ const char *get_system_type(void) return adm5120_board_name(); } -#ifdef CONFIG_USB static struct resource adm5120_hcd_resources[] = { [0] = { - .start = 0x11200000, - .end = 0x11200084, + .start = ADM5120_USBC_BASE, + .end = ADM5120_USBC_BASE+ADM5120_USBC_SIZE-1, .flags = IORESOURCE_MEM, }, [1] = { - .start = 0x3, - .end = 0x3, + .start = ADM5120_IRQ_USBC, + .end = ADM5120_IRQ_USBC, .flags = IORESOURCE_IRQ, }, }; @@ -105,5 +88,4 @@ static int __init adm5120_init(void) return platform_add_devices(devices, ARRAY_SIZE(devices)); } -arch_initcall(adm5120_init); -#endif +subsys_initcall(adm5120_init); |