mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
5b85e04e93
These are called by sa11x0_drv_pcmcia_probe (which is marked now with __devinit) so they can go to .devinit.text now, too. This fixes: WARNING: drivers/pcmcia/sa1100_cs.o(.text+0x10): Section mismatch in reference from the function sa11x0_drv_pcmcia_probe() to the function .init.text:pcmcia_simpad_init() The function sa11x0_drv_pcmcia_probe() references the function __init pcmcia_simpad_init(). This is often because sa11x0_drv_pcmcia_probe lacks a __init annotation or the annotation of pcmcia_simpad_init is wrong. and a similar warning for pcmcia_collie_init, pcmcia_cerf_init, pcmcia_h3600_init and pcmcia_shannon_init. While at it mark pcmcia_assabet_init with __devinit, too. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> CC: Russell King <linux@arm.linux.org.uk> CC: Eric Miao <eric.y.miao@gmail.com> CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
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 <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/irq.h>
|
|
#include <mach/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->socket.pci_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",
|
|
__func__, 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 __devinit 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;
|
|
}
|