Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e8804ff authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: m8xx_pcmcia.c should use iodyn resource manager 



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 80128ff7).

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

drivers/pcmcia/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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.

drivers/pcmcia/m8xx_pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/pcmcia/ss.h

+2 −0
Original line number Diff line number Diff line
@@ -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.