diff options
Diffstat (limited to 'include/asm-arm/arch-rpc')
-rw-r--r-- | include/asm-arm/arch-rpc/acornfb.h | 10 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/dma.h | 8 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/hardware.h | 10 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/ide.h | 12 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/io.h | 8 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/irq.h | 21 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/irqs.h | 8 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/keyboard.h | 11 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/memory.h | 22 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/processor.h | 14 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/serial.h | 12 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/system.h | 12 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/time.h | 16 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/timex.h | 10 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/uncompress.h | 8 | ||||
-rw-r--r-- | include/asm-arm/arch-rpc/vmalloc.h | 8 |
16 files changed, 130 insertions, 60 deletions
diff --git a/include/asm-arm/arch-rpc/acornfb.h b/include/asm-arm/arch-rpc/acornfb.h index 531481215..6c7696e67 100644 --- a/include/asm-arm/arch-rpc/acornfb.h +++ b/include/asm-arm/arch-rpc/acornfb.h @@ -1,9 +1,13 @@ /* - * linux/include/asm-arm/arch-rpc/acornfb.h + * linux/include/asm-arm/arch-rpc/acornfb.h * - * (C) 1999 Russell King + * Copyright (C) 1999 Russell King * - * AcornFB architecture specific code + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * AcornFB architecture specific code */ #define acornfb_valid_pixrate(rate) (1) diff --git a/include/asm-arm/arch-rpc/dma.h b/include/asm-arm/arch-rpc/dma.h index b52f5b110..d24a27e30 100644 --- a/include/asm-arm/arch-rpc/dma.h +++ b/include/asm-arm/arch-rpc/dma.h @@ -1,5 +1,11 @@ /* - * linux/include/asm-arm/arch-rpc/dma.h + * linux/include/asm-arm/arch-rpc/dma.h + * + * Copyright (C) 1997 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. */ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H diff --git a/include/asm-arm/arch-rpc/hardware.h b/include/asm-arm/arch-rpc/hardware.h index ce1a27b13..b13b4efbe 100644 --- a/include/asm-arm/arch-rpc/hardware.h +++ b/include/asm-arm/arch-rpc/hardware.h @@ -1,9 +1,13 @@ /* - * linux/include/asm-arm/arch-rpc/hardware.h + * linux/include/asm-arm/arch-rpc/hardware.h * - * Copyright (C) 1996-1999 Russell King. + * Copyright (C) 1996-1999 Russell King. * - * This file contains the hardware definitions of the RiscPC series machines. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This file contains the hardware definitions of the RiscPC series machines. */ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H diff --git a/include/asm-arm/arch-rpc/ide.h b/include/asm-arm/arch-rpc/ide.h index 827d81c2b..15fecab1f 100644 --- a/include/asm-arm/arch-rpc/ide.h +++ b/include/asm-arm/arch-rpc/ide.h @@ -1,10 +1,14 @@ /* - * linux/include/asm-arm/arch-rpc/ide.h + * linux/include/asm-arm/arch-rpc/ide.h * - * Copyright (c) 1997 Russell King + * Copyright (C) 1997 Russell King * - * Modifications: - * 29-07-1998 RMK Major re-work of IDE architecture specific code + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Modifications: + * 29-07-1998 RMK Major re-work of IDE architecture specific code */ #include <asm/irq.h> diff --git a/include/asm-arm/arch-rpc/io.h b/include/asm-arm/arch-rpc/io.h index 508560bda..81f201aae 100644 --- a/include/asm-arm/arch-rpc/io.h +++ b/include/asm-arm/arch-rpc/io.h @@ -1,7 +1,11 @@ /* - * linux/include/asm-arm/arch-rpc/io.h + * linux/include/asm-arm/arch-rpc/io.h * - * Copyright (C) 1997 Russell King + * Copyright (C) 1997 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * Modifications: * 06-Dec-1997 RMK Created. diff --git a/include/asm-arm/arch-rpc/irq.h b/include/asm-arm/arch-rpc/irq.h index c7d98b0c0..48aece366 100644 --- a/include/asm-arm/arch-rpc/irq.h +++ b/include/asm-arm/arch-rpc/irq.h @@ -1,13 +1,17 @@ /* - * include/asm-arm/arch-rpc/irq.h + * linux/include/asm-arm/arch-rpc/irq.h * - * Copyright (C) 1996 Russell King + * Copyright (C) 1996 Russell King * - * Changelog: + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Changelog: * 10-10-1996 RMK Brought up to date with arch-sa110eval * 22-08-1998 RMK Restructured IRQ routines */ -#include <asm/iomd.h> +#include <asm/hardware/iomd.h> #define fixup_irq(x) (x) @@ -152,21 +156,22 @@ static __inline__ void irq_init_irq(void) irq_desc[irq].unmask = rpc_unmask_irq_b; break; - case 16 ... 22: + case 16 ... 21: irq_desc[irq].valid = 1; + irq_desc[irq].noautoenable = 1; irq_desc[irq].mask_ack = rpc_mask_irq_dma; irq_desc[irq].mask = rpc_mask_irq_dma; irq_desc[irq].unmask = rpc_unmask_irq_dma; break; - case 32 ... 40: + case 32 ... 39: irq_desc[irq].valid = 1; irq_desc[irq].mask_ack = ecard_disableirq; irq_desc[irq].mask = ecard_disableirq; irq_desc[irq].unmask = ecard_enableirq; break; - case 64 ... 72: + case 64 ... 71: irq_desc[irq].valid = 1; irq_desc[irq].mask_ack = rpc_mask_irq_fiq; irq_desc[irq].mask = rpc_mask_irq_fiq; @@ -175,5 +180,7 @@ static __inline__ void irq_init_irq(void) } } + irq_desc[IRQ_KEYBOARDTX].noautoenable = 1; + init_FIQ(); } diff --git a/include/asm-arm/arch-rpc/irqs.h b/include/asm-arm/arch-rpc/irqs.h index 948ba961d..72ee47185 100644 --- a/include/asm-arm/arch-rpc/irqs.h +++ b/include/asm-arm/arch-rpc/irqs.h @@ -1,7 +1,11 @@ /* - * linux/include/asm-arm/arch-rpc/irqs.h + * linux/include/asm-arm/arch-rpc/irqs.h * - * Copyright (C) 1996 Russell King + * Copyright (C) 1996 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. */ #define IRQ_PRINTER 0 diff --git a/include/asm-arm/arch-rpc/keyboard.h b/include/asm-arm/arch-rpc/keyboard.h index c083b08bb..0e9566812 100644 --- a/include/asm-arm/arch-rpc/keyboard.h +++ b/include/asm-arm/arch-rpc/keyboard.h @@ -1,11 +1,14 @@ /* - * linux/include/asm-arm/arch-rpc/keyboard.h + * linux/include/asm-arm/arch-rpc/keyboard.h * - * Keyboard driver definitions for RiscPC architecture + * Copyright (C) 1998 Russell King * - * (C) 1998 Russell King + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Keyboard driver definitions for RiscPC architecture */ - #include <asm/irq.h> #define NR_SCANCODES 128 diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h index e5f59abdb..2b3899173 100644 --- a/include/asm-arm/arch-rpc/memory.h +++ b/include/asm-arm/arch-rpc/memory.h @@ -1,15 +1,19 @@ /* - * linux/include/asm-arm/arch-rpc/memory.h + * linux/include/asm-arm/arch-rpc/memory.h * - * Copyright (c) 1996,1997,1998 Russell King. + * Copyright (C) 1996,1997,1998 Russell King. * - * Changelog: - * 20-Oct-1996 RMK Created - * 31-Dec-1997 RMK Fixed definitions to reduce warnings - * 11-Jan-1998 RMK Uninlined to reduce hits on cache - * 08-Feb-1998 RMK Added __virt_to_bus and __bus_to_virt - * 21-Mar-1999 RMK Renamed to memory.h - * RMK Added TASK_SIZE and PAGE_OFFSET + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Changelog: + * 20-Oct-1996 RMK Created + * 31-Dec-1997 RMK Fixed definitions to reduce warnings + * 11-Jan-1998 RMK Uninlined to reduce hits on cache + * 08-Feb-1998 RMK Added __virt_to_bus and __bus_to_virt + * 21-Mar-1999 RMK Renamed to memory.h + * RMK Added TASK_SIZE and PAGE_OFFSET */ #ifndef __ASM_ARCH_MMU_H #define __ASM_ARCH_MMU_H diff --git a/include/asm-arm/arch-rpc/processor.h b/include/asm-arm/arch-rpc/processor.h index fd9aa088d..b64eaebfc 100644 --- a/include/asm-arm/arch-rpc/processor.h +++ b/include/asm-arm/arch-rpc/processor.h @@ -1,11 +1,15 @@ /* - * linux/include/asm-arm/arch-rpc/processor.h + * linux/include/asm-arm/arch-rpc/processor.h * - * Copyright (c) 1996-1999 Russell King. + * Copyright (C) 1996-1999 Russell King. * - * Changelog: - * 10-Sep-1996 RMK Created - * 21-Mar-1999 RMK Added asm/arch/memory.h + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Changelog: + * 10-Sep-1996 RMK Created + * 21-Mar-1999 RMK Added asm/arch/memory.h */ #ifndef __ASM_ARCH_PROCESSOR_H diff --git a/include/asm-arm/arch-rpc/serial.h b/include/asm-arm/arch-rpc/serial.h index 87e81c609..1497fc6fe 100644 --- a/include/asm-arm/arch-rpc/serial.h +++ b/include/asm-arm/arch-rpc/serial.h @@ -1,10 +1,14 @@ /* - * linux/include/asm-arm/arch-rpc/serial.h + * linux/include/asm-arm/arch-rpc/serial.h * - * Copyright (c) 1996 Russell King. + * Copyright (C) 1996 Russell King. * - * Changelog: - * 15-10-1996 RMK Created + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Changelog: + * 15-10-1996 RMK Created */ #ifndef __ASM_ARCH_SERIAL_H #define __ASM_ARCH_SERIAL_H diff --git a/include/asm-arm/arch-rpc/system.h b/include/asm-arm/arch-rpc/system.h index 885e43de3..2e8711ec5 100644 --- a/include/asm-arm/arch-rpc/system.h +++ b/include/asm-arm/arch-rpc/system.h @@ -1,10 +1,14 @@ /* - * linux/include/asm-arm/arch-rpc/system.h + * linux/include/asm-arm/arch-rpc/system.h * - * Copyright (c) 1996-1999 Russell King. + * Copyright (C) 1996-1999 Russell King. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. */ #include <asm/arch/hardware.h> -#include <asm/iomd.h> +#include <asm/hardware/iomd.h> #include <asm/io.h> static void arch_idle(void) @@ -17,7 +21,7 @@ static void arch_idle(void) if (current->need_resched || hlt_counter) goto slow_out; cpu_do_idle(IDLE_WAIT_FAST); - } while (time_before(start_idle, jiffies + HZ/3)); + } while (time_before(jiffies, start_idle + HZ/50)); cpu_do_idle(IDLE_CLOCK_SLOW); diff --git a/include/asm-arm/arch-rpc/time.h b/include/asm-arm/arch-rpc/time.h index 94974241f..334de6235 100644 --- a/include/asm-arm/arch-rpc/time.h +++ b/include/asm-arm/arch-rpc/time.h @@ -1,12 +1,16 @@ /* - * linux/include/asm-arm/arch-rpc/time.h + * linux/include/asm-arm/arch-rpc/time.h * - * Copyright (c) 1996-2000 Russell King. + * Copyright (C) 1996-2000 Russell King. * - * Changelog: - * 24-Sep-1996 RMK Created - * 10-Oct-1996 RMK Brought up to date with arch-sa110eval - * 04-Dec-1997 RMK Updated for new arch/arm/time.c + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Changelog: + * 24-Sep-1996 RMK Created + * 10-Oct-1996 RMK Brought up to date with arch-sa110eval + * 04-Dec-1997 RMK Updated for new arch/arm/time.c */ extern void ioctime_init(void); diff --git a/include/asm-arm/arch-rpc/timex.h b/include/asm-arm/arch-rpc/timex.h index cb3c72abe..ed7df64d9 100644 --- a/include/asm-arm/arch-rpc/timex.h +++ b/include/asm-arm/arch-rpc/timex.h @@ -1,9 +1,13 @@ /* - * linux/include/asm-arm/arch-rpc/timex.h + * linux/include/asm-arm/arch-rpc/timex.h * - * RiscPC architecture timex specifications + * Copyright (C) 1997, 1998 Russell King * - * Copyright (C) 1997, 1998 Russell King + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * RiscPC architecture timex specifications */ /* diff --git a/include/asm-arm/arch-rpc/uncompress.h b/include/asm-arm/arch-rpc/uncompress.h index 21701094a..0834d287e 100644 --- a/include/asm-arm/arch-rpc/uncompress.h +++ b/include/asm-arm/arch-rpc/uncompress.h @@ -1,7 +1,11 @@ /* - * linux/include/asm-arm/arch-a5k/uncompress.h + * linux/include/asm-arm/arch-rpc/uncompress.h * - * Copyright (C) 1996 Russell King + * Copyright (C) 1996 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. */ #define VIDMEM ((char *)SCREEN_START) diff --git a/include/asm-arm/arch-rpc/vmalloc.h b/include/asm-arm/arch-rpc/vmalloc.h index 60f72ec84..579bd1190 100644 --- a/include/asm-arm/arch-rpc/vmalloc.h +++ b/include/asm-arm/arch-rpc/vmalloc.h @@ -1,5 +1,11 @@ /* - * linux/include/asm-arm/arch-rpc/vmalloc.h + * linux/include/asm-arm/arch-rpc/vmalloc.h + * + * Copyright (C) 1997 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. */ /* |