pcmcia: m8xx_pcmcia.c should use iodyn resource manager
Dominik Brodowski [Wed, 6 Jan 2010 10:19:25 +0000 (11:19 +0100)]
The socket driver m8xx_pcmcia.c uses a static memory assignment,
but io_offset is set to 0. Therefore, it seems proper to use the
iodyn resource manager for this driver, as was previously the
case (before commit 80128ff79d282cf71b1819dbca9b8dd47d8ed3e8).

CC: Vitaly Bordug <vitb@kernel.crashing.org>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Olof Johansson <olof@lixom.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

drivers/pcmcia/Kconfig
drivers/pcmcia/m8xx_pcmcia.c
include/pcmcia/ss.h

index 7e9fd38..44b324b 100644 (file)
@@ -163,7 +163,6 @@ config PCMCIA_M8XX
        tristate "MPC8xx PCMCIA support"
        depends on PCMCIA && PPC && 8xx
        select PCCARD_IODYN
-       select PCCARD_NONSTATIC
        help
          Say Y here to include support for PowerPC 8xx series PCMCIA
          controller.
index 7f79c4e..3a1fe3a 100644 (file)
@@ -1233,7 +1233,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
                socket[i].socket.io_offset = 0;
                socket[i].socket.pci_irq = pcmcia_schlvl;
                socket[i].socket.ops = &m8xx_services;
-               socket[i].socket.resource_ops = &pccard_nonstatic_ops;
+               socket[i].socket.resource_ops = &pccard_iodyn_ops;
                socket[i].socket.cb_dev = NULL;
                socket[i].socket.dev.parent = &ofdev->dev;
                socket[i].pcmcia = pcmcia;
index b4e5cfd..1a47379 100644 (file)
@@ -258,6 +258,8 @@ struct pcmcia_socket {
  * - pccard_static_ops         iomem and ioport areas are assigned statically
  * - pccard_iodyn_ops          iomem areas is assigned statically, ioport
  *                             areas dynamically
+ *                             If this option is selected, use
+ *                             "select PCCARD_IODYN" in Kconfig.
  * - pccard_nonstatic_ops      iomem and ioport areas are assigned dynamically.
  *                             If this option is selected, use
  *                             "select PCCARD_NONSTATIC" in Kconfig.