forked from luck/tmp_suning_uos_patched
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>
135 lines
2.9 KiB
C
135 lines
2.9 KiB
C
/*
|
|
* drivers/pcmcia/sa1100_simpad.c
|
|
*
|
|
* PCMCIA implementation routines for simpad
|
|
*
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/arch/simpad.h>
|
|
#include "sa1100_generic.h"
|
|
|
|
extern long get_cs3_shadow(void);
|
|
extern void set_cs3_bit(int value);
|
|
extern void clear_cs3_bit(int value);
|
|
|
|
static struct pcmcia_irqs irqs[] = {
|
|
{ 1, IRQ_GPIO_CF_CD, "CF_CD" },
|
|
};
|
|
|
|
static int simpad_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
|
|
{
|
|
|
|
clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
|
|
|
|
skt->irq = IRQ_GPIO_CF_IRQ;
|
|
|
|
return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
}
|
|
|
|
static void simpad_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
|
|
{
|
|
soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
|
|
/* Disable CF bus: */
|
|
//set_cs3_bit(PCMCIA_BUFF_DIS);
|
|
clear_cs3_bit(PCMCIA_RESET);
|
|
}
|
|
|
|
static void
|
|
simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
|
|
struct pcmcia_state *state)
|
|
{
|
|
unsigned long levels = GPLR;
|
|
long cs3reg = get_cs3_shadow();
|
|
|
|
state->detect=((levels & GPIO_CF_CD)==0)?1:0;
|
|
state->ready=(levels & GPIO_CF_IRQ)?1:0;
|
|
state->bvd1=1; /* Not available on Simpad. */
|
|
state->bvd2=1; /* Not available on Simpad. */
|
|
state->wrprot=0; /* Not available on Simpad. */
|
|
|
|
if((cs3reg & 0x0c) == 0x0c) {
|
|
state->vs_3v=0;
|
|
state->vs_Xv=0;
|
|
} else {
|
|
state->vs_3v=1;
|
|
state->vs_Xv=0;
|
|
}
|
|
}
|
|
|
|
static int
|
|
simpad_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
|
|
const socket_state_t *state)
|
|
{
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
|
|
|
/* Murphy: see table of MIC2562a-1 */
|
|
switch (state->Vcc) {
|
|
case 0:
|
|
clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
|
|
break;
|
|
|
|
case 33:
|
|
clear_cs3_bit(VCC_3V_EN|EN1);
|
|
set_cs3_bit(VCC_5V_EN|EN0);
|
|
break;
|
|
|
|
case 50:
|
|
clear_cs3_bit(VCC_5V_EN|EN1);
|
|
set_cs3_bit(VCC_3V_EN|EN0);
|
|
break;
|
|
|
|
default:
|
|
printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
|
|
__FUNCTION__, state->Vcc);
|
|
clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
|
|
local_irq_restore(flags);
|
|
return -1;
|
|
}
|
|
|
|
|
|
local_irq_restore(flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void simpad_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
|
|
{
|
|
soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
}
|
|
|
|
static void simpad_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
|
|
{
|
|
soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
|
|
set_cs3_bit(PCMCIA_RESET);
|
|
}
|
|
|
|
static struct pcmcia_low_level simpad_pcmcia_ops = {
|
|
.owner = THIS_MODULE,
|
|
.hw_init = simpad_pcmcia_hw_init,
|
|
.hw_shutdown = simpad_pcmcia_hw_shutdown,
|
|
.socket_state = simpad_pcmcia_socket_state,
|
|
.configure_socket = simpad_pcmcia_configure_socket,
|
|
.socket_init = simpad_pcmcia_socket_init,
|
|
.socket_suspend = simpad_pcmcia_socket_suspend,
|
|
};
|
|
|
|
int __init pcmcia_simpad_init(struct device *dev)
|
|
{
|
|
int ret = -ENODEV;
|
|
|
|
if (machine_is_simpad())
|
|
ret = sa11xx_drv_pcmcia_probe(dev, &simpad_pcmcia_ops, 1, 1);
|
|
|
|
return ret;
|
|
}
|