pcmcia: journada720: use sa1100 pin interfaces correctly
commit dabd14684b
"PCMCIA: sa1111: remove duplicated initializers"
incorrectly moved some code into the pcmcia_jornada720_init, causing
a few build errors, and for unknown reasons, the driver lacks
an inclusion of <linux/io.h>, so we get the build errors, and more:
sa1111_jornada720.c: In function 'pcmcia_jornada720_init':
sa1111_jornada720.c:101:3: error: implicit declaration of function 'IOMEM' [-Werror=implicit-function-declaration]
GRER |= 0x00000002;
^
sa1111_jornada720.c:104:3: warning: passing argument 1 of 'sa1111_set_io_dir' from incompatible pointer type [enabled by default]
sa1111_set_io_dir(dev, pin, 0, 0);
^
This patch uses the SA1111_DEV() to convert the dev pointer to the
correct type before passing it and adds the missing include.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Cc: linux-pcmcia@lists.infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f1674f213e
commit
58409f9d21
|
@ -9,6 +9,7 @@
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
#include <linux/io.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <asm/hardware/sa1111.h>
|
#include <asm/hardware/sa1111.h>
|
||||||
|
@ -94,6 +95,7 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = {
|
||||||
int pcmcia_jornada720_init(struct device *dev)
|
int pcmcia_jornada720_init(struct device *dev)
|
||||||
{
|
{
|
||||||
int ret = -ENODEV;
|
int ret = -ENODEV;
|
||||||
|
struct sa1111_dev *sadev = SA1111_DEV(dev);
|
||||||
|
|
||||||
if (machine_is_jornada720()) {
|
if (machine_is_jornada720()) {
|
||||||
unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
|
unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
|
||||||
|
@ -101,12 +103,12 @@ int pcmcia_jornada720_init(struct device *dev)
|
||||||
GRER |= 0x00000002;
|
GRER |= 0x00000002;
|
||||||
|
|
||||||
/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
|
/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
|
||||||
sa1111_set_io_dir(dev, pin, 0, 0);
|
sa1111_set_io_dir(sadev, pin, 0, 0);
|
||||||
sa1111_set_io(dev, pin, 0);
|
sa1111_set_io(sadev, pin, 0);
|
||||||
sa1111_set_sleep_io(dev, pin, 0);
|
sa1111_set_sleep_io(sadev, pin, 0);
|
||||||
|
|
||||||
sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops);
|
sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops);
|
||||||
ret = sa1111_pcmcia_add(dev, &jornada720_pcmcia_ops,
|
ret = sa1111_pcmcia_add(sadev, &jornada720_pcmcia_ops,
|
||||||
sa11xx_drv_pcmcia_add_one);
|
sa11xx_drv_pcmcia_add_one);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue