Input: move documentation for Amiga CD32

Move the documentation for Amiga CD32 together with other parallel port
joysticks.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/Documentation/input/cd32.rst b/Documentation/input/cd32.rst
deleted file mode 100644 (file)
index 935028b..0000000
--- a/Documentation/input/cd32.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-==========
-Amiga CD32
-==========
-
-I have written a small patch that let's me use my Amiga CD32
-joypad connected to the parallel port. Thought I'd share it with you so
-you can add it to the list of supported joysticks (hopefully someone will
-find it useful).
-
-It needs the following wiring:
-
-===========    =============
-CD32 pad       Parallel port
-===========    =============
-1 (Up)          2 (D0)
-2 (Down)        3 (D1)
-3 (Left)        4 (D2)
-4 (Right)       5 (D3)
-5 (Fire3)      14 (AUTOFD)
-6 (Fire1)      17 (SELIN)
-7 (+5V)         1 (STROBE)
-8 (Gnd)        18 (Gnd)
-9 (Fire2)       7 (D5)
-===========    =============

diff --git a/Documentation/input/index.rst b/Documentation/input/index.rst
index 153f0d476c3edcf5bdb943717edcbe93775adb24..32c0515fd24b7b0a0f678b41b446f001fb57f844 100644 (file)
--- a/Documentation/input/index.rst
+++ b/Documentation/input/index.rst
@@ -54,7 +54,6 @@ Input drivers
    appletouch
    atarikbd
    bcm5974
-   cd32
    cma3000_d0x
    cs461x
    edt-ft5x06

diff --git a/Documentation/input/joystick-parport.rst b/Documentation/input/joystick-parport.rst
index 0aa0fb17bf48e5b68548fac6605554c6f4d21503..fa8cab584793f2d9fbf37f3064238cb8a5680871 100644 (file)
--- a/Documentation/input/joystick-parport.rst
+++ b/Documentation/input/joystick-parport.rst
@@ -443,6 +443,43 @@ parallel port::
 The other pins (Up, Down, Right, Left, Power, Ground) are the same as for
 Multi joysticks using db9.c
 
+Amiga CD32
+----------
+
+Amiga CD32 joypad uses the following pinout::
+
+        +-----------> Button 3
+        | +---------> Right
+        | | +-------> Left
+        | | | +-----> Down
+        | | | | +---> Up
+        | | | | |
+      _____________
+    5 \ o o o o o / 1
+       \ o o o o /
+      9 `~~~~~~~' 6
+        | | | |
+        | | | +----> Button 1
+        | | +------> Power
+        | +--------> Ground
+        +----------> Button 2
+
+It can be connected to the parallel port and driven by db9.c driver. It needs the following wiring:
+
+       ============    =============
+       CD32 pad        Parallel port
+       ============    =============
+       1 (Up)           2 (D0)
+       2 (Down)         3 (D1)
+       3 (Left)         4 (D2)
+       4 (Right)        5 (D3)
+       5 (Button 3)    14 (AUTOFD)
+       6 (Button 1)    17 (SELIN)
+       7 (+5V)          1 (STROBE)
+       8 (Gnd)         18 (Gnd)
+       9 (Button 2)     7 (D5)
+       ============    =============
+
 The drivers
 ===========