Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

Some manual fixups required due to clashes with the PF_FREEZE cleanups.

5 files changed, 6 insertions, 530 deletions

diff --git a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig
index 1d93f509290..7524bd7d8b8 100644
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
@@ -49,22 +49,8 @@ config GAMEPORT_EMU10K1
           To compile this driver as a module, choose M here: the
           module will be called emu10k1-gp.
 
-config GAMEPORT_VORTEX
-        tristate "Aureal Vortex, Vortex 2 gameport support"
-        depends on PCI
-        help
-          Say Y here if you have an Aureal Vortex 1 or 2  card and want
-          to use its gameport.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vortex.
-
 config GAMEPORT_FM801
         tristate "ForteMedia FM801 gameport support"
         depends on PCI
 
-config GAMEPORT_CS461X
-        tristate "Crystal SoundFusion gameport support"
-        depends on PCI
-
 endif
diff --git a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile
index 5367b4267ad..b6f6097bd8c 100644
--- a/drivers/input/gameport/Makefile
+++ b/drivers/input/gameport/Makefile
@@ -5,9 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_GAMEPORT)          += gameport.o
-obj-$(CONFIG_GAMEPORT_CS461X)   += cs461x.o
 obj-$(CONFIG_GAMEPORT_EMU10K1)  += emu10k1-gp.o
 obj-$(CONFIG_GAMEPORT_FM801)    += fm801-gp.o
 obj-$(CONFIG_GAMEPORT_L4)       += lightning.o
 obj-$(CONFIG_GAMEPORT_NS558)    += ns558.o
-obj-$(CONFIG_GAMEPORT_VORTEX)   += vortex.o
diff --git a/drivers/input/gameport/cs461x.c b/drivers/input/gameport/cs461x.c
deleted file mode 100644
index d4013ff9862..00000000000
--- a/drivers/input/gameport/cs461x.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-        The all defines and part of code (such as cs461x_*) are
-        contributed from ALSA 0.5.8 sources.
-        See http://www.alsa-project.org/ for sources
-
-        Tested on Linux 686 2.4.0-test9, ALSA 0.5.8a and CS4610
-*/
-
-#include <asm/io.h>
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/gameport.h>
-#include <linux/slab.h>
-#include <linux/pci.h>
-
-MODULE_AUTHOR("Victor Krapivin");
-MODULE_LICENSE("GPL");
-
-/*
-        These options are experimental
-
-#define CS461X_FULL_MAP
-*/
-
-
-#ifndef PCI_VENDOR_ID_CIRRUS
-#define PCI_VENDOR_ID_CIRRUS            0x1013
-#endif
-#ifndef PCI_DEVICE_ID_CIRRUS_4610
-#define PCI_DEVICE_ID_CIRRUS_4610       0x6001
-#endif
-#ifndef PCI_DEVICE_ID_CIRRUS_4612
-#define PCI_DEVICE_ID_CIRRUS_4612       0x6003
-#endif
-#ifndef PCI_DEVICE_ID_CIRRUS_4615
-#define PCI_DEVICE_ID_CIRRUS_4615       0x6004
-#endif
-
-/* Registers */
-
-#define BA0_JSPT                                0x00000480
-#define BA0_JSCTL                               0x00000484
-#define BA0_JSC1                                0x00000488
-#define BA0_JSC2                                0x0000048C
-#define BA0_JSIO                                0x000004A0
-
-/* Bits for JSPT */
-
-#define JSPT_CAX                                0x00000001
-#define JSPT_CAY                                0x00000002
-#define JSPT_CBX                                0x00000004
-#define JSPT_CBY                                0x00000008
-#define JSPT_BA1                                0x00000010
-#define JSPT_BA2                                0x00000020
-#define JSPT_BB1                                0x00000040
-#define JSPT_BB2                                0x00000080
-
-/* Bits for JSCTL */
-
-#define JSCTL_SP_MASK                           0x00000003
-#define JSCTL_SP_SLOW                           0x00000000
-#define JSCTL_SP_MEDIUM_SLOW                    0x00000001
-#define JSCTL_SP_MEDIUM_FAST                    0x00000002
-#define JSCTL_SP_FAST                           0x00000003
-#define JSCTL_ARE                               0x00000004
-
-/* Data register pairs masks */
-
-#define JSC1_Y1V_MASK                           0x0000FFFF
-#define JSC1_X1V_MASK                           0xFFFF0000
-#define JSC1_Y1V_SHIFT                          0
-#define JSC1_X1V_SHIFT                          16
-#define JSC2_Y2V_MASK                           0x0000FFFF
-#define JSC2_X2V_MASK                           0xFFFF0000
-#define JSC2_Y2V_SHIFT                          0
-#define JSC2_X2V_SHIFT                          16
-
-/* JS GPIO */
-
-#define JSIO_DAX                                0x00000001
-#define JSIO_DAY                                0x00000002
-#define JSIO_DBX                                0x00000004
-#define JSIO_DBY                                0x00000008
-#define JSIO_AXOE                               0x00000010
-#define JSIO_AYOE                               0x00000020
-#define JSIO_BXOE                               0x00000040
-#define JSIO_BYOE                               0x00000080
-
-/*
-   The card initialization code is obfuscated; the module cs461x
-   need to be loaded after ALSA modules initialized and something
-   played on the CS 4610 chip (see sources for details of CS4610
-   initialization code from ALSA)
-*/
-
-/* Card specific definitions */
-
-#define CS461X_BA0_SIZE         0x2000
-#define CS461X_BA1_DATA0_SIZE   0x3000
-#define CS461X_BA1_DATA1_SIZE   0x3800
-#define CS461X_BA1_PRG_SIZE     0x7000
-#define CS461X_BA1_REG_SIZE     0x0100
-
-#define BA1_SP_DMEM0                            0x00000000
-#define BA1_SP_DMEM1                            0x00010000
-#define BA1_SP_PMEM                             0x00020000
-#define BA1_SP_REG                              0x00030000
-
-#define BA1_DWORD_SIZE          (13 * 1024 + 512)
-#define BA1_MEMORY_COUNT        3
-
-/*
-   Only one CS461x card is still suppoted; the code requires
-   redesign to avoid this limitatuion.
-*/
-
-static unsigned long ba0_addr;
-static unsigned int __iomem *ba0;
-
-#ifdef CS461X_FULL_MAP
-static unsigned long ba1_addr;
-static union ba1_t {
-        struct {
-                unsigned int __iomem *data0;
-                unsigned int __iomem *data1;
-                unsigned int __iomem *pmem;
-                unsigned int __iomem *reg;
-        } name;
-        unsigned int __iomem *idx[4];
-} ba1;
-
-static void cs461x_poke(unsigned long reg, unsigned int val)
-{
-        writel(val, &ba1.idx[(reg >> 16) & 3][(reg >> 2) & 0x3fff]);
-}
-
-static unsigned int cs461x_peek(unsigned long reg)
-{
-        return readl(&ba1.idx[(reg >> 16) & 3][(reg >> 2) & 0x3fff]);
-}
-
-#endif
-
-static void cs461x_pokeBA0(unsigned long reg, unsigned int val)
-{
-        writel(val, &ba0[reg >> 2]);
-}
-
-static unsigned int cs461x_peekBA0(unsigned long reg)
-{
-        return readl(&ba0[reg >> 2]);
-}
-
-static int cs461x_free(struct pci_dev *pdev)
-{
-        struct gameport *port = pci_get_drvdata(pdev);
-
-        if (port)
-            gameport_unregister_port(port);
-
-        if (ba0) iounmap(ba0);
-#ifdef CS461X_FULL_MAP
-        if (ba1.name.data0) iounmap(ba1.name.data0);
-        if (ba1.name.data1) iounmap(ba1.name.data1);
-        if (ba1.name.pmem)  iounmap(ba1.name.pmem);
-        if (ba1.name.reg)   iounmap(ba1.name.reg);
-#endif
-        return 0;
-}
-
-static void cs461x_gameport_trigger(struct gameport *gameport)
-{
-        cs461x_pokeBA0(BA0_JSPT, 0xFF);  //outb(gameport->io, 0xFF);
-}
-
-static unsigned char cs461x_gameport_read(struct gameport *gameport)
-{
-        return cs461x_peekBA0(BA0_JSPT); //inb(gameport->io);
-}
-
-static int cs461x_gameport_cooked_read(struct gameport *gameport, int *axes, int *buttons)
-{
-        unsigned js1, js2, jst;
-
-        js1 = cs461x_peekBA0(BA0_JSC1);
-        js2 = cs461x_peekBA0(BA0_JSC2);
-        jst = cs461x_peekBA0(BA0_JSPT);
-
-        *buttons = (~jst >> 4) & 0x0F;
-
-        axes[0] = ((js1 & JSC1_Y1V_MASK) >> JSC1_Y1V_SHIFT) & 0xFFFF;
-        axes[1] = ((js1 & JSC1_X1V_MASK) >> JSC1_X1V_SHIFT) & 0xFFFF;
-        axes[2] = ((js2 & JSC2_Y2V_MASK) >> JSC2_Y2V_SHIFT) & 0xFFFF;
-        axes[3] = ((js2 & JSC2_X2V_MASK) >> JSC2_X2V_SHIFT) & 0xFFFF;
-
-        for(jst=0;jst<4;++jst)
-                if(axes[jst]==0xFFFF) axes[jst] = -1;
-        return 0;
-}
-
-static int cs461x_gameport_open(struct gameport *gameport, int mode)
-{
-        switch (mode) {
-                case GAMEPORT_MODE_COOKED:
-                case GAMEPORT_MODE_RAW:
-                        return 0;
-                default:
-                        return -1;
-        }
-        return 0;
-}
-
-static struct pci_device_id cs461x_pci_tbl[] = {
-        { PCI_VENDOR_ID_CIRRUS, 0x6001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Cirrus CS4610 */
-        { PCI_VENDOR_ID_CIRRUS, 0x6003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Cirrus CS4612 */
-        { PCI_VENDOR_ID_CIRRUS, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Cirrus CS4615 */
-        { 0, }
-};
-MODULE_DEVICE_TABLE(pci, cs461x_pci_tbl);
-
-static int __devinit cs461x_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        int rc;
-        struct gameport* port;
-
-        rc = pci_enable_device(pdev);
-        if (rc) {
-                printk(KERN_ERR "cs461x: Cannot enable PCI gameport (bus %d, devfn %d) error=%d\n",
-                        pdev->bus->number, pdev->devfn, rc);
-                return rc;
-        }
-
-        ba0_addr = pci_resource_start(pdev, 0);
-#ifdef CS461X_FULL_MAP
-        ba1_addr = pci_resource_start(pdev, 1);
-#endif
-        if (ba0_addr == 0 || ba0_addr == ~0
-#ifdef CS461X_FULL_MAP
-            || ba1_addr == 0 || ba1_addr == ~0
-#endif
-            ) {
-                printk(KERN_ERR "cs461x: wrong address - ba0 = 0x%lx\n", ba0_addr);
-#ifdef CS461X_FULL_MAP
-                printk(KERN_ERR "cs461x: wrong address - ba1 = 0x%lx\n", ba1_addr);
-#endif
-                cs461x_free(pdev);
-                return -ENOMEM;
-        }
-
-        ba0 = ioremap(ba0_addr, CS461X_BA0_SIZE);
-#ifdef CS461X_FULL_MAP
-        ba1.name.data0 = ioremap(ba1_addr + BA1_SP_DMEM0, CS461X_BA1_DATA0_SIZE);
-        ba1.name.data1 = ioremap(ba1_addr + BA1_SP_DMEM1, CS461X_BA1_DATA1_SIZE);
-        ba1.name.pmem  = ioremap(ba1_addr + BA1_SP_PMEM, CS461X_BA1_PRG_SIZE);
-        ba1.name.reg   = ioremap(ba1_addr + BA1_SP_REG, CS461X_BA1_REG_SIZE);
-
-        if (ba0 == NULL || ba1.name.data0 == NULL ||
-            ba1.name.data1 == NULL || ba1.name.pmem == NULL ||
-            ba1.name.reg == NULL) {
-                cs461x_free(pdev);
-                return -ENOMEM;
-        }
-#else
-        if (ba0 == NULL) {
-                cs461x_free(pdev);
-                return -ENOMEM;
-        }
-#endif
-
-        if (!(port = gameport_allocate_port())) {
-                printk(KERN_ERR "cs461x: Memory allocation failed\n");
-                cs461x_free(pdev);
-                return -ENOMEM;
-        }
-
-        pci_set_drvdata(pdev, port);
-
-        port->open = cs461x_gameport_open;
-        port->trigger = cs461x_gameport_trigger;
-        port->read = cs461x_gameport_read;
-        port->cooked_read = cs461x_gameport_cooked_read;
-
-        gameport_set_name(port, "CS416x");
-        gameport_set_phys(port, "pci%s/gameport0", pci_name(pdev));
-        port->dev.parent = &pdev->dev;
-
-        cs461x_pokeBA0(BA0_JSIO, 0xFF); // ?
-        cs461x_pokeBA0(BA0_JSCTL, JSCTL_SP_MEDIUM_SLOW);
-
-        gameport_register_port(port);
-
-        return 0;
-}
-
-static void __devexit cs461x_pci_remove(struct pci_dev *pdev)
-{
-        cs461x_free(pdev);
-}
-
-static struct pci_driver cs461x_pci_driver = {
-        .name =         "CS461x_gameport",
-        .id_table =     cs461x_pci_tbl,
-        .probe =        cs461x_pci_probe,
-        .remove =       __devexit_p(cs461x_pci_remove),
-};
-
-static int __init cs461x_init(void)
-{
-        return pci_register_driver(&cs461x_pci_driver);
-}
-
-static void __exit cs461x_exit(void)
-{
-        pci_unregister_driver(&cs461x_pci_driver);
-}
-
-module_init(cs461x_init);
-module_exit(cs461x_exit);
-
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 7c5c6318eeb..1ab5f2dc8a2 100644
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -258,18 +258,18 @@ static int __init ns558_init(void)
 {
         int i = 0;
 
+        if (pnp_register_driver(&ns558_pnp_driver) >= 0)
+                pnp_registered = 1;
+
 /*
- * Probe ISA ports first so that PnP gets to choose free port addresses
- * not occupied by the ISA ports.
+ * Probe ISA ports after PnP, so that PnP ports that are already
+ * enabled get detected as PnP. This may be suboptimal in multi-device
+ * configurations, but saves hassle with simple setups.
  */
 
         while (ns558_isa_portlist[i])
                 ns558_isa_probe(ns558_isa_portlist[i++]);
 
-        if (pnp_register_driver(&ns558_pnp_driver) >= 0)
-                pnp_registered = 1;
-
-
         return (list_empty(&ns558_list) && !pnp_registered) ? -ENODEV : 0;
 }
 
diff --git a/drivers/input/gameport/vortex.c b/drivers/input/gameport/vortex.c
deleted file mode 100644
index 36b0309c8bf..00000000000
--- a/drivers/input/gameport/vortex.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * $Id: vortex.c,v 1.5 2002/07/01 15:39:30 vojtech Exp $
- *
- *  Copyright (c) 2000-2001 Vojtech Pavlik
- *
- *  Based on the work of:
- *      Raymond Ingles
- */
-
-/*
- * Trident 4DWave and Aureal Vortex gameport driver for Linux
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
- */
-
-#include <asm/io.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/gameport.h>
-
-MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
-MODULE_DESCRIPTION("Aureal Vortex and Vortex2 gameport driver");
-MODULE_LICENSE("GPL");
-
-#define VORTEX_GCR              0x0c    /* Gameport control register */
-#define VORTEX_LEG              0x08    /* Legacy port location */
-#define VORTEX_AXD              0x10    /* Axes start */
-#define VORTEX_DATA_WAIT        20      /* 20 ms */
-
-struct vortex {
-        struct gameport *gameport;
-        struct pci_dev *dev;
-        unsigned char __iomem *base;
-        unsigned char __iomem *io;
-};
-
-static unsigned char vortex_read(struct gameport *gameport)
-{
-        struct vortex *vortex = gameport->port_data;
-        return readb(vortex->io + VORTEX_LEG);
-}
-
-static void vortex_trigger(struct gameport *gameport)
-{
-        struct vortex *vortex = gameport->port_data;
-        writeb(0xff, vortex->io + VORTEX_LEG);
-}
-
-static int vortex_cooked_read(struct gameport *gameport, int *axes, int *buttons)
-{
-        struct vortex *vortex = gameport->port_data;
-        int i;
-
-        *buttons = (~readb(vortex->base + VORTEX_LEG) >> 4) & 0xf;
-
-        for (i = 0; i < 4; i++) {
-                axes[i] = readw(vortex->io + VORTEX_AXD + i * sizeof(u32));
-                if (axes[i] == 0x1fff) axes[i] = -1;
-        }
-
-        return 0;
-}
-
-static int vortex_open(struct gameport *gameport, int mode)
-{
-        struct vortex *vortex = gameport->port_data;
-
-        switch (mode) {
-                case GAMEPORT_MODE_COOKED:
-                        writeb(0x40, vortex->io + VORTEX_GCR);
-                        msleep(VORTEX_DATA_WAIT);
-                        return 0;
-                case GAMEPORT_MODE_RAW:
-                        writeb(0x00, vortex->io + VORTEX_GCR);
-                        return 0;
-                default:
-                        return -1;
-        }
-
-        return 0;
-}
-
-static int __devinit vortex_probe(struct pci_dev *dev, const struct pci_device_id *id)
-{
-        struct vortex *vortex;
-        struct gameport *port;
-        int i;
-
-        vortex = kcalloc(1, sizeof(struct vortex), GFP_KERNEL);
-        port = gameport_allocate_port();
-        if (!vortex || !port) {
-                printk(KERN_ERR "vortex: Memory allocation failed.\n");
-                kfree(vortex);
-                gameport_free_port(port);
-                return -ENOMEM;
-        }
-
-        for (i = 0; i < 6; i++)
-                if (~pci_resource_flags(dev, i) & IORESOURCE_IO)
-                        break;
-
-        pci_enable_device(dev);
-
-        vortex->dev = dev;
-        vortex->gameport = port;
-        vortex->base = ioremap(pci_resource_start(vortex->dev, i),
-                                pci_resource_len(vortex->dev, i));
-        vortex->io = vortex->base + id->driver_data;
-
-        pci_set_drvdata(dev, vortex);
-
-        port->port_data = vortex;
-        port->fuzz = 64;
-
-        gameport_set_name(port, "AU88x0");
-        gameport_set_phys(port, "pci%s/gameport0", pci_name(dev));
-        port->dev.parent = &dev->dev;
-        port->read = vortex_read;
-        port->trigger = vortex_trigger;
-        port->cooked_read = vortex_cooked_read;
-        port->open = vortex_open;
-
-        gameport_register_port(port);
-
-        return 0;
-}
-
-static void __devexit vortex_remove(struct pci_dev *dev)
-{
-        struct vortex *vortex = pci_get_drvdata(dev);
-
-        gameport_unregister_port(vortex->gameport);
-        iounmap(vortex->base);
-        kfree(vortex);
-}
-
-static struct pci_device_id vortex_id_table[] = {
-        { 0x12eb, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x11000 },
-        { 0x12eb, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x28800 },
-        { 0 }
-};
-
-static struct pci_driver vortex_driver = {
-        .name =         "vortex_gameport",
-        .id_table =     vortex_id_table,
-        .probe =        vortex_probe,
-        .remove =       __devexit_p(vortex_remove),
-};
-
-static int __init vortex_init(void)
-{
-        return pci_register_driver(&vortex_driver);
-}
-
-static void __exit vortex_exit(void)
-{
-        pci_unregister_driver(&vortex_driver);
-}
-
-module_init(vortex_init);
-module_exit(vortex_exit);