Merge with Linux 2.4.0-test12.

4 files changed, 101 insertions, 13 deletions

diff --git a/Documentation/arm/README b/Documentation/arm/README
index 96bdfe3e2..8514dac03 100644
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
@@ -157,7 +157,8 @@ Kernel entry (head-armv.S)
   the mail a subject of 'Register new architecture':
 
     Name: <name of your architecture>
-    ARCHDIR: <name of include/asm-arm/arch-* directory>
+    ArchDir: <name of include/asm-arm/arch-* directory>
+    Type: <MACH_TYPE_* macro name>
     Description:
     <description of your architecture>
 
diff --git a/Documentation/arm/SA1100/ThinClient b/Documentation/arm/SA1100/GraphicsClient
index d5d7625fd..01f3f050a 100644
--- a/Documentation/arm/SA1100/ThinClient
+++ b/Documentation/arm/SA1100/GraphicsClient
@@ -1,24 +1,21 @@
-Thin Client / Single Board Computer
-
-The Thin Client, a low cost high power single board computer, has been
-designed to provide intuitive graphical displays in embedded systems.
+ADS GraphicsClient/ThinClient Single Board Computer
 
 For more details, contact Applied Data Systems or see
 http://www.flatpanels.com/products.html
 
-Current Linux support for this product has been provided by Nicolas Pitre
-<nico@cam.org>.
+The original Linux support for this product has been provided by 
+Nicolas Pitre <nico@cam.org>.
 
 It's currently possible to mount a root filesystem via NFS providing a
 complete Linux environment.  Otherwise a ramdisk image may be used.  Use
-'make thinclient_config' before any 'make config'.  This will set up
-defaults for ThinClient support.
+'make graphicsclient_config' before any 'make config'.  This will set up
+defaults for GraphicsClient/ThinClient support.
 
 The kernel zImage is linked to be loaded and executed at 0xc0200000.  
 Also the following registers should have the specified values upon entry:
 
 	r0 = 0
-	r1 = 24	(this is the ThinClient architecture number)
+	r1 = 29	(this is the GraphicsClient architecture number)
 
 Here is a tipical angel.opt option file if the kernel is loaded through
 the Angel Debug Monitor:
@@ -27,7 +24,7 @@ the Angel Debug Monitor:
 base 0xc0200000
 entry 0xc0200000
 r0 0x00000000
-r1 0x00000018
+r1 0x0000001d
 device /dev/ttyS1
 options "9600 8N1"
 baud 115200
@@ -41,7 +38,7 @@ uncommented) would be loaded with:
 
 	angelboot -f angelboot.opt zImage
 
-Here it is assumed that the ThinClient is connected to ttyS1 on your PC
+Here it is assumed that the board is connected to ttyS1 on your PC
 and that minicom is preconfigured with /dev/ttyS1, 9600 baud, 8N1, no flow
 control by default.
 
@@ -54,13 +51,13 @@ Supported peripherals:
 - on-board SMC 92C94 ethernet NIC
 - SA1100 serial port
 - flash memory access
+- pcmcia
 - possibly UCB1200 audio (not tested yet)
 
 To do:
 - touchscreen driver
 - 16bpp frame buffer support
 - extra (external) serial port driver
-- pcmcia
 - some console keyboard support (maybe IR?)
 - everything else!  :-)
 
diff --git a/Documentation/arm/SA1100/Pangolin b/Documentation/arm/SA1100/Pangolin
new file mode 100644
index 000000000..88cff5bf1
--- /dev/null
+++ b/Documentation/arm/SA1100/Pangolin
@@ -0,0 +1,25 @@
+Pangolin is a StrongARM 1110-based evaluation  platform produced
+by Dialogue Technoloy (http://www.dialogue.com.tw/).
+It has EISA slots for ease of configuration with SDRAM/Flash
+memory card, USB/Serial/Audio card, Compact Flash card,
+and TFT-LCD card.
+This platform is currently under development.
+
+To compile for Pangolin, you must issue the following commands:
+
+	make pangolin_config
+	make config
+	[accept all defaults]
+	make dep
+	make zImage
+
+Supported peripherals:
+- SA1110 serial port
+- flash memory access
+
+Testing:
+- pcmcia driver
+- sound driver
+
+To do:
+- MQ-200 driver
diff --git a/Documentation/arm/SA1100/serial_UART b/Documentation/arm/SA1100/serial_UART
new file mode 100644
index 000000000..3807dea19
--- /dev/null
+++ b/Documentation/arm/SA1100/serial_UART
@@ -0,0 +1,65 @@
+The SA1100 serial port finally had its major/minor numbers officially 
+assigned:
+
+> Date: Sun, 24 Sep 2000 21:40:27 -0700
+> From: H. Peter Anvin <hpa@transmeta.com>
+> To: Nicolas Pitre <nico@CAM.ORG>
+> Cc: Device List Maintainer <device@lanana.org>
+> Subject: Re: device
+> 
+> Okay.  Note that device numbers 204 and 205 are used for "low density
+> serial devices", so you will have a range of minors on those majors (the
+> tty device layer handles this just fine, so you don't have to worry about
+> doing anything special.)
+> 
+> So your assignments are:
+> 
+> 204 char        Low-density serial ports
+>                   5 = /dev/ttySA0               SA1100 builtin serial port 0
+>                   6 = /dev/ttySA1               SA1100 builtin serial port 1
+>                   7 = /dev/ttySA2               SA1100 builtin serial port 2
+> 
+> 205 char        Low-density serial ports (alternate device)
+>                   5 = /dev/cusa0                Callout device for ttySA0
+>                   6 = /dev/cusa1                Callout device for ttySA1
+>                   7 = /dev/cusa2                Callout device for ttySA2
+>
+
+So, if you're not using devfs, you must create those inodes in /dev
+on the root filesystem used by your SA1100-based device:
+
+	mknod ttySA0 c 204 5
+	mknod ttySA1 c 204 6
+	mknod ttySA2 c 204 7
+	mknod cusa0 c 205 5
+	mknod cusa1 c 205 6
+	mknod cusa2 c 205 7
+
+Note that the old incorrect use of /dev/ttyS0 in order to use the serial port 
+won't work anymore.  This device node is reserved to the conventionnal 16x50
+UART which may appear on devices like PCMCIA modem, etc.
+
+In addition to the creation of the appropriate device nodes above, you must
+ensure your user space applications make use of the correct device name.
+The classic example is the content of the /etc/inittab where you might have 
+a getty process started on ttyS0.  In this case you have two choices:
+
+1- replace occurences of ttyS0 with ttySA0, ttyS1 with ttySA1, etc.
+
+2- in the occurence of 'ttyS0', you may consider replacing it with 'console'.
+   as in "T0:12345:respawn:/sbin/getty -L console 9600 vt100"
+
+(don't forget to add 'ttySA0', 'console', or the appropriate tty name 
+ in /etc/securetty for root to be allowed to login as well.)
+
+The use of /dev/console has the advantage of being independent of the real
+serial device used.  The kernel automatically forward all operations on
+/dev/console to the apropriate serial device.  The nature of the console may
+also be modified with a kernel command line parameter (see
+Documentation/serial-console.txt for the details).  Of course, 
+/dev/console must have been created as a char device with major 5 minor 1.
+
+Using /dev/console is also compatible with older kernels that used /dev/ttyS0.
+Therefore it is handy for ramdisk images which are targetted for different
+StrongARM platforms and older kernels.
+