mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
58409f9d21
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>
117 lines
2.4 KiB
C
117 lines
2.4 KiB
C
/*
|
|
* drivers/pcmcia/sa1100_jornada720.c
|
|
*
|
|
* Jornada720 PCMCIA specific routines
|
|
*
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/hardware/sa1111.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#include "sa1111_generic.h"
|
|
|
|
/* Does SOCKET1_3V actually do anything? */
|
|
#define SOCKET0_POWER GPIO_GPIO0
|
|
#define SOCKET0_3V GPIO_GPIO2
|
|
#define SOCKET1_POWER (GPIO_GPIO1 | GPIO_GPIO3)
|
|
#define SOCKET1_3V GPIO_GPIO3
|
|
|
|
static int
|
|
jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
|
|
{
|
|
struct sa1111_pcmcia_socket *s = to_skt(skt);
|
|
unsigned int pa_dwr_mask, pa_dwr_set;
|
|
int ret;
|
|
|
|
printk(KERN_INFO "%s(): config socket %d vcc %d vpp %d\n", __func__,
|
|
skt->nr, state->Vcc, state->Vpp);
|
|
|
|
switch (skt->nr) {
|
|
case 0:
|
|
pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
|
|
|
|
switch (state->Vcc) {
|
|
default:
|
|
case 0:
|
|
pa_dwr_set = 0;
|
|
break;
|
|
case 33:
|
|
pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;
|
|
break;
|
|
case 50:
|
|
pa_dwr_set = SOCKET0_POWER;
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case 1:
|
|
pa_dwr_mask = SOCKET1_POWER;
|
|
|
|
switch (state->Vcc) {
|
|
default:
|
|
case 0:
|
|
pa_dwr_set = 0;
|
|
break;
|
|
case 33:
|
|
pa_dwr_set = SOCKET1_POWER;
|
|
break;
|
|
case 50:
|
|
pa_dwr_set = SOCKET1_POWER;
|
|
break;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
return -1;
|
|
}
|
|
|
|
if (state->Vpp != state->Vcc && state->Vpp != 0) {
|
|
printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
|
|
__func__, state->Vpp);
|
|
return -EPERM;
|
|
}
|
|
|
|
ret = sa1111_pcmcia_configure_socket(skt, state);
|
|
if (ret == 0)
|
|
sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct pcmcia_low_level jornada720_pcmcia_ops = {
|
|
.owner = THIS_MODULE,
|
|
.configure_socket = jornada720_pcmcia_configure_socket,
|
|
.first = 0,
|
|
.nr = 2,
|
|
};
|
|
|
|
int pcmcia_jornada720_init(struct device *dev)
|
|
{
|
|
int ret = -ENODEV;
|
|
struct sa1111_dev *sadev = SA1111_DEV(dev);
|
|
|
|
if (machine_is_jornada720()) {
|
|
unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
|
|
|
|
GRER |= 0x00000002;
|
|
|
|
/* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
|
|
sa1111_set_io_dir(sadev, pin, 0, 0);
|
|
sa1111_set_io(sadev, pin, 0);
|
|
sa1111_set_sleep_io(sadev, pin, 0);
|
|
|
|
sa11xx_drv_pcmcia_ops(&jornada720_pcmcia_ops);
|
|
ret = sa1111_pcmcia_add(sadev, &jornada720_pcmcia_ops,
|
|
sa11xx_drv_pcmcia_add_one);
|
|
}
|
|
|
|
return ret;
|
|
}
|