mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
![Tim Schmielau](/assets/img/avatar_default.png)
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>
168 lines
4.1 KiB
C
168 lines
4.1 KiB
C
/*
|
|
* linux/drivers/pcmcia/sa1100_badge4.c
|
|
*
|
|
* BadgePAD 4 PCMCIA specific routines
|
|
*
|
|
* Christopher Hoover <ch@hpl.hp.com>
|
|
*
|
|
* Copyright (C) 2002 Hewlett-Packard Company
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/arch/badge4.h>
|
|
#include <asm/hardware/sa1111.h>
|
|
|
|
#include "sa1111_generic.h"
|
|
|
|
/*
|
|
* BadgePAD 4 Details
|
|
*
|
|
* PCM Vcc:
|
|
*
|
|
* PCM Vcc on BadgePAD 4 can be jumpered for 3v3 (short pins 1 and 3
|
|
* on JP6) or 5v0 (short pins 3 and 5 on JP6).
|
|
*
|
|
* PCM Vpp:
|
|
*
|
|
* PCM Vpp on BadgePAD 4 can be jumpered for 12v0 (short pins 4 and 6
|
|
* on JP6) or tied to PCM Vcc (short pins 2 and 4 on JP6). N.B.,
|
|
* 12v0 operation requires that the power supply actually supply 12v0
|
|
* via pin 7 of JP7.
|
|
*
|
|
* CF Vcc:
|
|
*
|
|
* CF Vcc on BadgePAD 4 can be jumpered either for 3v3 (short pins 1
|
|
* and 2 on JP10) or 5v0 (short pins 2 and 3 on JP10).
|
|
*
|
|
* Unfortunately there's no way programmatically to determine how a
|
|
* given board is jumpered. This code assumes a default jumpering
|
|
* as described below.
|
|
*
|
|
* If the defaults aren't correct, you may override them with a pcmv
|
|
* setup argument: pcmv=<pcm vcc>,<pcm vpp>,<cf vcc>. The units are
|
|
* tenths of volts; e.g. pcmv=33,120,50 indicates 3v3 PCM Vcc, 12v0
|
|
* PCM Vpp, and 5v0 CF Vcc.
|
|
*
|
|
*/
|
|
|
|
static int badge4_pcmvcc = 50; /* pins 3 and 5 jumpered on JP6 */
|
|
static int badge4_pcmvpp = 50; /* pins 2 and 4 jumpered on JP6 */
|
|
static int badge4_cfvcc = 33; /* pins 1 and 2 jumpered on JP10 */
|
|
|
|
static void complain_about_jumpering(const char *whom,
|
|
const char *supply,
|
|
int given, int wanted)
|
|
{
|
|
printk(KERN_ERR
|
|
"%s: %s %d.%dV wanted but board is jumpered for %s %d.%dV operation"
|
|
"; re-jumper the board and/or use pcmv=xx,xx,xx\n",
|
|
whom, supply,
|
|
wanted / 10, wanted % 10,
|
|
supply,
|
|
given / 10, given % 10);
|
|
}
|
|
|
|
static int
|
|
badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
|
|
{
|
|
int ret;
|
|
|
|
switch (skt->nr) {
|
|
case 0:
|
|
if ((state->Vcc != 0) &&
|
|
(state->Vcc != badge4_pcmvcc)) {
|
|
complain_about_jumpering(__FUNCTION__, "pcmvcc",
|
|
badge4_pcmvcc, state->Vcc);
|
|
// Apply power regardless of the jumpering.
|
|
// return -1;
|
|
}
|
|
if ((state->Vpp != 0) &&
|
|
(state->Vpp != badge4_pcmvpp)) {
|
|
complain_about_jumpering(__FUNCTION__, "pcmvpp",
|
|
badge4_pcmvpp, state->Vpp);
|
|
return -1;
|
|
}
|
|
break;
|
|
|
|
case 1:
|
|
if ((state->Vcc != 0) &&
|
|
(state->Vcc != badge4_cfvcc)) {
|
|
complain_about_jumpering(__FUNCTION__, "cfvcc",
|
|
badge4_cfvcc, state->Vcc);
|
|
return -1;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
return -1;
|
|
}
|
|
|
|
ret = sa1111_pcmcia_configure_socket(skt, state);
|
|
if (ret == 0) {
|
|
unsigned long flags;
|
|
int need5V;
|
|
|
|
local_irq_save(flags);
|
|
|
|
need5V = ((state->Vcc == 50) || (state->Vpp == 50));
|
|
|
|
badge4_set_5V(BADGE4_5V_PCMCIA_SOCK(skt->nr), need5V);
|
|
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct pcmcia_low_level badge4_pcmcia_ops = {
|
|
.owner = THIS_MODULE,
|
|
.hw_init = sa1111_pcmcia_hw_init,
|
|
.hw_shutdown = sa1111_pcmcia_hw_shutdown,
|
|
.socket_state = sa1111_pcmcia_socket_state,
|
|
.configure_socket = badge4_pcmcia_configure_socket,
|
|
|
|
.socket_init = sa1111_pcmcia_socket_init,
|
|
.socket_suspend = sa1111_pcmcia_socket_suspend,
|
|
};
|
|
|
|
int pcmcia_badge4_init(struct device *dev)
|
|
{
|
|
int ret = -ENODEV;
|
|
|
|
if (machine_is_badge4()) {
|
|
printk(KERN_INFO
|
|
"%s: badge4_pcmvcc=%d, badge4_pcmvpp=%d, badge4_cfvcc=%d\n",
|
|
__FUNCTION__,
|
|
badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc);
|
|
|
|
ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int __init pcmv_setup(char *s)
|
|
{
|
|
int v[4];
|
|
|
|
s = get_options(s, ARRAY_SIZE(v), v);
|
|
|
|
if (v[0] >= 1) badge4_pcmvcc = v[1];
|
|
if (v[0] >= 2) badge4_pcmvpp = v[2];
|
|
if (v[0] >= 3) badge4_cfvcc = v[3];
|
|
|
|
return 1;
|
|
}
|
|
|
|
__setup("pcmv=", pcmv_setup);
|