diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
| commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
| tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /arch/mips/deskstation | |
| parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) | |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'arch/mips/deskstation')
| -rw-r--r-- | arch/mips/deskstation/int-handler.S | 13 | ||||
| -rw-r--r-- | arch/mips/deskstation/reset.c | 20 | ||||
| -rw-r--r-- | arch/mips/deskstation/setup.c | 8 |
3 files changed, 26 insertions, 15 deletions
diff --git a/arch/mips/deskstation/int-handler.S b/arch/mips/deskstation/int-handler.S index d7ff36d0f..b7fd32d71 100644 --- a/arch/mips/deskstation/int-handler.S +++ b/arch/mips/deskstation/int-handler.S @@ -38,8 +38,6 @@ or t0,s1 sb t0,%lo(cache_21)(s4) sb t0,%lo(PORT_BASE+0x21)(s0) - lui s3,%hi(intr_count) - lw s7,%lo(intr_count)(s3) li t2,0x20 sb t2,%lo(PORT_BASE+0x20)(s0) /* @@ -49,10 +47,8 @@ sll t2,a0,PTRLOG addu t3,t2 LONG_L t3,(t3) - addiu t0,s7,1 jalr t3 - sw t0,%lo(intr_count)(s3) - sw s7,%lo(intr_count)(s3) + nop # delay slot /* * Unblock first pic */ @@ -85,8 +81,6 @@ poll_second: li a0,0x0f sb t3,%lo(PORT_BASE+0xa1)(s0) li t3,0x20 sb t3,%lo(PORT_BASE+0xa0)(s0) - lui s3,%hi(intr_count) - lw s7,%lo(intr_count)(s3) sb t3,%lo(PORT_BASE+0x20)(s0) /* * Now call the real handler @@ -96,16 +90,13 @@ poll_second: li a0,0x0f sll t2,a0,PTRLOG addu t3,t2 LONG_L t3,(t3) - addiu t0,s7,1 jalr t3 - sw t0,%lo(intr_count)(s3) # delay slot - sw s7,%lo(intr_count)(s3) + nop # delay slot /* * Unblock second pic */ lb t1,%lo(PORT_BASE+0xa1)(s0) lb t1,%lo(cache_A1)(s4) - subu t0,1 nor s1,zero,s1 and t1,t1,s1 sb t1,%lo(cache_A1)(s4) diff --git a/arch/mips/deskstation/reset.c b/arch/mips/deskstation/reset.c index 7fb387631..9d45898a4 100644 --- a/arch/mips/deskstation/reset.c +++ b/arch/mips/deskstation/reset.c @@ -4,12 +4,26 @@ * Reset a Deskstation. */ #include <asm/io.h> +#include <asm/reboot.h> #include <asm/system.h> -void -jazz_hard_reset_now(void) +void deskstation_machine_restart(void) { - printk("Implement jazz_hard_reset_now().\n"); + printk("Implement deskstation_machine_restart().\n"); + printk("Press reset to continue.\n"); + while(1); +} + +void deskstation_machine_halt(void) +{ + printk("Implement deskstation_machine_halt().\n"); + printk("Press reset to continue.\n"); + while(1); +} + +void deskstation_machine_power_off(void) +{ + printk("Implement dec_machine_power_off().\n"); printk("Press reset to continue.\n"); while(1); } diff --git a/arch/mips/deskstation/setup.c b/arch/mips/deskstation/setup.c index 59d3da401..c2451e855 100644 --- a/arch/mips/deskstation/setup.c +++ b/arch/mips/deskstation/setup.c @@ -17,6 +17,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/mipsregs.h> +#include <asm/reboot.h> #include <asm/vector.h> /* @@ -33,7 +34,10 @@ extern asmlinkage void deskstation_handle_int(void); extern asmlinkage void deskstation_fd_cacheflush(const void *addr, size_t size); extern struct feature deskstation_tyne_feature; extern struct feature deskstation_rpc44_feature; -extern void deskstation_hard_reset_now(void); + +extern void deskstation_machine_reboot(void); +extern void deskstation_machine_halt(void); +extern void deskstation_machine_power_off(void); #ifdef CONFIG_DESKSTATION_TYNE unsigned long mips_dma_cache_size = 0; @@ -103,4 +107,6 @@ deskstation_setup(void) request_region(0x00,0x20,"dma1"); request_region(0x40,0x20,"timer"); request_region(0x70,0x10,"rtc"); + request_region(0x80,0x10,"dma page reg"); + request_region(0xc0,0x20,"dma2"); } |