cd354f1ae7
After Al Viro (finally) succeeded in removing the sched.h #include in module.h recently, it makes sense again to remove other superfluous sched.h includes. There are quite a lot of files which include it but don't actually need anything defined in there. Presumably these includes were once needed for macros that used to live in sched.h, but moved to other header files in the course of cleaning it up. To ease the pain, this time I did not fiddle with any header files and only removed #includes from .c-files, which tend to cause less trouble. Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha, arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig, allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all configs in arch/arm/configs on arm. I also checked that no new warnings were introduced by the patch (actually, some warnings are removed that were emitted by unnecessarily included header files). Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
109 lines
2.4 KiB
C
109 lines
2.4 KiB
C
/*
|
|
* drivers/pcmcia/sa1100_cerf.c
|
|
*
|
|
* PCMCIA implementation routines for CerfBoard
|
|
* Based off the Assabet.
|
|
*
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/init.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include <asm/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/arch/cerf.h>
|
|
#include "sa1100_generic.h"
|
|
|
|
#define CERF_SOCKET 1
|
|
|
|
static struct pcmcia_irqs irqs[] = {
|
|
{ CERF_SOCKET, CERF_IRQ_GPIO_CF_CD, "CF_CD" },
|
|
{ CERF_SOCKET, CERF_IRQ_GPIO_CF_BVD2, "CF_BVD2" },
|
|
{ CERF_SOCKET, CERF_IRQ_GPIO_CF_BVD1, "CF_BVD1" }
|
|
};
|
|
|
|
static int cerf_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
|
|
{
|
|
skt->irq = CERF_IRQ_GPIO_CF_IRQ;
|
|
|
|
return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
}
|
|
|
|
static void cerf_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
|
|
{
|
|
soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
}
|
|
|
|
static void
|
|
cerf_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
|
|
{
|
|
unsigned long levels = GPLR;
|
|
|
|
state->detect = (levels & CERF_GPIO_CF_CD) ?0:1;
|
|
state->ready = (levels & CERF_GPIO_CF_IRQ) ?1:0;
|
|
state->bvd1 = (levels & CERF_GPIO_CF_BVD1)?1:0;
|
|
state->bvd2 = (levels & CERF_GPIO_CF_BVD2)?1:0;
|
|
state->wrprot = 0;
|
|
state->vs_3v = 1;
|
|
state->vs_Xv = 0;
|
|
}
|
|
|
|
static int
|
|
cerf_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
|
|
const socket_state_t *state)
|
|
{
|
|
switch (state->Vcc) {
|
|
case 0:
|
|
case 50:
|
|
case 33:
|
|
break;
|
|
|
|
default:
|
|
printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
|
|
__FUNCTION__, state->Vcc);
|
|
return -1;
|
|
}
|
|
|
|
if (state->flags & SS_RESET) {
|
|
GPSR = CERF_GPIO_CF_RESET;
|
|
} else {
|
|
GPCR = CERF_GPIO_CF_RESET;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void cerf_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
|
|
{
|
|
soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
}
|
|
|
|
static void cerf_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
|
|
{
|
|
soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
}
|
|
|
|
static struct pcmcia_low_level cerf_pcmcia_ops = {
|
|
.owner = THIS_MODULE,
|
|
.hw_init = cerf_pcmcia_hw_init,
|
|
.hw_shutdown = cerf_pcmcia_hw_shutdown,
|
|
.socket_state = cerf_pcmcia_socket_state,
|
|
.configure_socket = cerf_pcmcia_configure_socket,
|
|
|
|
.socket_init = cerf_pcmcia_socket_init,
|
|
.socket_suspend = cerf_pcmcia_socket_suspend,
|
|
};
|
|
|
|
int __init pcmcia_cerf_init(struct device *dev)
|
|
{
|
|
int ret = -ENODEV;
|
|
|
|
if (machine_is_cerf())
|
|
ret = sa11xx_drv_pcmcia_probe(dev, &cerf_pcmcia_ops, CERF_SOCKET, 1);
|
|
|
|
return ret;
|
|
}
|