Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/include/asm-arm/arch-shark dma.h,1.1.1.1,1.2 hardware.h,1.1.1.1,1.2 ide.h,1.1.1.1,1.2 io.h,1.1.1.2,1.2 irq.h,1.1.1.1,1.2 irqs.h,1.1.1.1,1.2 keyboard.h,1.1.1.1,1.2 memory.h,1.1.1.1,1.2 param.h,1.1.1.1,1.2 system.h,1.1.1.1,1.2 time.h,1.1.1.1,1.2 timex.h,1.1.1.1,1.2 uncompress.h,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 12:33:56
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-arm/arch-shark
Modified Files:
dma.h hardware.h ide.h io.h irq.h irqs.h keyboard.h memory.h
param.h system.h time.h timex.h uncompress.h
Log Message:
Synch to 2.4.15 commit 1
Index: dma.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/dma.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dma.h 14 Jan 2001 16:58:55 -0000 1.1.1.1
+++ dma.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/dma.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*/
#ifndef __ASM_ARCH_DMA_H
#define __ASM_ARCH_DMA_H
@@ -13,6 +13,18 @@
#define MAX_DMA_ADDRESS 0xC0400000
#define MAX_DMA_CHANNELS 8
#define DMA_ISA_CASCADE 4
+
+static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsigned long *zhole_size)
+{
+ if (node != 0) return;
+ /* Only the first 4 MB (=1024 Pages) are usable for DMA */
+ zone_size[1] = zone_size[0] - 1024;
+ zone_size[0] = 1024;
+ zhole_size[1] = zhole_size[0];
+ zhole_size[0] = 0;
+}
+
+#define arch_adjust_zones(node,size,holes) __arch_adjust_zones(node,size,holes)
#endif /* _ASM_ARCH_DMA_H */
Index: hardware.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/hardware.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hardware.h 14 Jan 2001 16:58:55 -0000 1.1.1.1
+++ hardware.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/hardware.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*
* derived from:
* linux/include/asm-arm/arch-ebsa110/hardware.h
@@ -40,14 +40,16 @@
/* defines for the Framebuffer */
#define FB_START 0x06000000
-/* Registers for Framebuffer */
-/*#define FBREG_START 0x06800000*/
-
#define UNCACHEABLE_ADDR 0xdf010000
#define SEQUOIA_LED_GREEN (1<<6)
#define SEQUOIA_LED_AMBER (1<<5)
#define SEQUOIA_LED_BACK (1<<7)
+
+#define pcibios_assign_all_busses() 1
+
+#define PCIBIOS_MIN_IO 0x6000
+#define PCIBIOS_MIN_MEM 0x50000000
#endif
Index: ide.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/ide.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ide.h 14 Jan 2001 16:58:55 -0000 1.1.1.1
+++ ide.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/ide.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*
* derived from:
* linux/include/asm-arm/arch-ebsa285/ide.h
Index: io.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/io.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- io.h 25 Feb 2001 23:14:53 -0000 1.1.1.2
+++ io.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/io.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*
* derived from:
* linux/include/asm-arm/arch-ebsa110/io.h
@@ -11,7 +11,8 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
-#define __arch_ioremap(off,size,nocache) __ioremap(off,size,0)
+#define iomem_valid_addr(off,sz) (1)
+#define iomem_to_phys(off) (off)
#define IO_SPACE_LIMIT 0xffffffff
@@ -28,7 +29,7 @@
* optimize the expressions
*/
#define DECLARE_DYN_OUT(fnsuffix,instr) \
-extern __inline__ void __out##fnsuffix (unsigned int value, unsigned int port) \
+static inline void __out##fnsuffix (unsigned int value, unsigned int port) \
{ \
unsigned long temp; \
__asm__ __volatile__( \
@@ -42,7 +43,7 @@
}
#define DECLARE_DYN_IN(sz,fnsuffix,instr) \
-extern __inline__ unsigned sz __in##fnsuffix (unsigned int port) \
+static inline unsigned sz __in##fnsuffix (unsigned int port) \
{ \
unsigned long temp, value; \
__asm__ __volatile__( \
@@ -56,7 +57,7 @@
return (unsigned sz)value; \
}
-extern __inline__ unsigned int __ioaddr (unsigned int port) \
+static inline unsigned int __ioaddr (unsigned int port) \
{ \
if (__PORT_PCIO(port)) \
return (unsigned int)(PCIO_BASE + (port)); \
Index: irq.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/irq.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- irq.h 14 Jan 2001 16:58:56 -0000 1.1.1.1
+++ irq.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,13 +1,14 @@
/*
* linux/include/asm-arm/arch-shark/irq.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*
* derived from linux/arch/ppc/kernel/i8259.c and:
* include/asm-arm/arch-ebsa110/irq.h
* Copyright (C) 1996-1998 Russell King
*/
+#include <asm/io.h>
#define fixup_irq(x) (x)
/*
Index: irqs.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/irqs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- irqs.h 14 Jan 2001 16:58:56 -0000 1.1.1.1
+++ irqs.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/irqs.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*/
#define NR_IRQS 16
Index: keyboard.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/keyboard.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- keyboard.h 14 Jan 2001 16:58:57 -0000 1.1.1.1
+++ keyboard.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,6 +1,6 @@
/*
* linux/include/asm-arm/arch-shark/keyboard.h
- * by Ale...@st...
+ * by Alexander Schulz
*
* Derived from linux/include/asm-arm/arch-ebsa285/keyboard.h
* (C) 1998 Russell King
@@ -11,6 +11,12 @@
#include <asm/io.h>
#include <asm/system.h>
+#define KEYBOARD_IRQ IRQ_ISA_KEYBOARD
+#define NR_SCANCODES 128
+
+#define kbd_disable_irq() do { } while (0)
+#define kbd_enable_irq() do { } while (0)
+
extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode);
extern int pckbd_getkeycode(unsigned int scancode);
extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
@@ -20,22 +26,25 @@
extern void pckbd_init_hw(void);
extern unsigned char pckbd_sysrq_xlate[128];
-#define KEYBOARD_IRQ IRQ_ISA_KEYBOARD
-
-#define NR_SCANCODES 128
-
-#define kbd_setkeycode(sc,kc) pckbd_setkeycode(sc,kc)
-#define kbd_getkeycode(sc) pckbd_getkeycode(sc)
-#define kbd_translate(sc, kcp, rm) pckbd_translate(sc, kcp, rm)
-#define kbd_unexpected_up pckbd_unexpected_up
-#define kbd_leds(leds) pckbd_leds(leds)
-#define kbd_init_hw() pckbd_init_hw()
-#define kbd_sysrq_xlate pckbd_sysrq_xlate
+static inline void kbd_init_hw(void)
+{
+ if (have_isa_bridge) {
+ k_setkeycode = pckbd_setkeycode;
+ k_getkeycode = pckbd_getkeycode;
+ k_translate = pckbd_translate;
+ k_unexpected_up = pckbd_unexpected_up;
+ k_leds = pckbd_leds;
+#ifdef CONFIG_MAGIC_SYSRQ
+ k_sysrq_key = 0x54;
+ k_sysrq_xlate = pckbd_sysrq_xlate;
+#endif
+ pckbd_init_hw();
+ }
+}
-#define kbd_disable_irq()
-#define kbd_enable_irq()
-
-#define SYSRQ_KEY 0x54
+/*
+ * PC Keyboard specifics
+ */
/* resource allocation */
#define kbd_request_region() request_region(0x60, 16, "keyboard")
Index: memory.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/memory.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- memory.h 14 Jan 2001 16:58:57 -0000 1.1.1.1
+++ memory.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/memory.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*
* derived from:
* linux/include/asm-arm/arch-ebsa110/memory.h
@@ -37,5 +37,7 @@
#define __virt_to_bus(x) __virt_to_phys(x)
#define __bus_to_virt__is_a_macro
#define __bus_to_virt(x) __phys_to_virt(x)
+
+#define PHYS_TO_NID(addr) (0)
#endif
Index: param.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/param.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- param.h 14 Jan 2001 16:58:57 -0000 1.1.1.1
+++ param.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,10 +1,12 @@
/*
* linux/include/asm-arm/arch-shark/param.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*/
/* This must be a power of 2 because the RTC
* can't use anything else.
*/
#define HZ 64
+
+#define hz_to_std(a) ((a * HZ)/100)
Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/system.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- system.h 14 Jan 2001 16:58:57 -0000 1.1.1.1
+++ system.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/system.h
*
- * Copyright (c) 1996-1998 Russell King.
+ * by Alexander Schulz
*/
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
Index: time.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/time.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- time.h 14 Jan 2001 16:58:57 -0000 1.1.1.1
+++ time.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,7 +1,7 @@
/*
* linux/include/asm-arm/arch-shark/time.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*
* Uses the real time clock because you can't run
* the timer with level triggered interrupts and
@@ -46,7 +46,7 @@
/*
* Set up timer interrupt, and return the current time in seconds.
*/
-extern __inline__ void setup_timer(void)
+static inline void setup_timer(void)
{
struct rtc_time r_time;
unsigned long flags;
Index: timex.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/timex.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- timex.h 14 Jan 2001 16:58:57 -0000 1.1.1.1
+++ timex.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-shark/timex.h
*
- * by Ale...@st...
+ * by Alexander Schulz
*/
Index: uncompress.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-shark/uncompress.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- uncompress.h 14 Jan 2001 16:58:57 -0000 1.1.1.1
+++ uncompress.h 9 Apr 2002 12:33:09 -0000 1.2
@@ -1,31 +1,57 @@
/*
- * linux/include/asm-arm/arch-ebsa110/uncompress.h
+ * linux/include/asm-arm/arch-shark/uncompress.h
+ * by Alexander Schulz
*
+ * derived from:
+ * linux/include/asm-arm/arch-ebsa285/uncompress.h
* Copyright (C) 1996,1997,1998 Russell King
*/
+#define SERIAL_BASE ((volatile unsigned char *)0x400003f8)
+
+static __inline__ void putc(char c)
+{
+ int t;
+
+ SERIAL_BASE[0] = c;
+ t=0x10000;
+ while (t--);
+}
+
/*
* This does not append a newline
*/
static void puts(const char *s)
{
- __asm__ __volatile__("
- ldrb %0, [%2], #1
- teq %0, #0
- beq 3f
-1: strb %0, [%3]
-2: ldrb %1, [%3, #0x14]
- and %1, %1, #0x60
- teq %1, #0x60
- bne 2b
- teq %0, #'\n'
- moveq %0, #'\r'
- beq 1b
- ldrb %0, [%2], #1
- teq %0, #0
- bne 1b
-3: " : : "r" (0), "r" (0), "r" (s), "r" (0xf0000be0) : "cc");
+ while (*s) {
+ putc(*s);
+ if (*s == '\n')
+ putc('\r');
+ s++;
+ }
+}
+
+#ifdef DEBUG
+static void putn(unsigned long z)
+{
+ int i;
+ char x;
+
+ putc('0');
+ putc('x');
+ for (i=0;i<8;i++) {
+ x='0'+((z>>((7-i)*4))&0xf);
+ if (x>'9') x=x-'0'+'A'-10;
+ putc(x);
+ }
+}
+
+static void putr()
+{
+ putc('\n');
+ putc('\r');
}
+#endif
/*
* nothing to do
|
