iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCMCIA: sa11x0: nanoengine: convert to use new irq/gpio management

Browse Source 
Convert Nanoengine socket driver to use the new irq/gpio management.
This is slightly more involved because we have to touch the private
platform header file to modify the GPIO bitmasks to be GPIO numbers.

Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2012-01-13 23:05:12 +00:00
parent bbb58a1210
commit 7cf779cb8d
2 changed files with 15 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-sa1100/include/mach/nanoengine.h
View File

@ -16,10 +16,10 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#define GPIO_PC_READY0 GPIO_GPIO(11) /* ready for socket 0 (active high)*/ #define GPIO_PC_READY0 11 /* ready for socket 0 (active high)*/
#define GPIO_PC_READY1 GPIO_GPIO(12) /* ready for socket 1 (active high) */ #define GPIO_PC_READY1 12 /* ready for socket 1 (active high) */
#define GPIO_PC_CD0 GPIO_GPIO(13) /* detect for socket 0 (active low) */ #define GPIO_PC_CD0 13 /* detect for socket 0 (active low) */
#define GPIO_PC_CD1 GPIO_GPIO(14) /* detect for socket 1 (active low) */ #define GPIO_PC_CD1 14 /* detect for socket 1 (active low) */
#define GPIO_PC_RESET0 GPIO_GPIO(15) /* reset socket 0 */ #define GPIO_PC_RESET0 GPIO_GPIO(15) /* reset socket 0 */
#define GPIO_PC_RESET1 GPIO_GPIO(16) /* reset socket 1 */ #define GPIO_PC_RESET1 GPIO_GPIO(16) /* reset socket 1 */

101
drivers/pcmcia/sa1100_nanoengine.c
View File

@ -34,43 +34,24 @@
#include "sa1100_generic.h" #include "sa1100_generic.h"
static struct pcmcia_irqs irqs_skt0[] = {
/* socket, IRQ, name */
{ 0, NANOENGINE_IRQ_GPIO_PC_CD0, "PC CD0" },
};
static struct pcmcia_irqs irqs_skt1[] = {
/* socket, IRQ, name */
{ 1, NANOENGINE_IRQ_GPIO_PC_CD1, "PC CD1" },
};
struct nanoengine_pins { struct nanoengine_pins {
unsigned input_pins;
unsigned output_pins; unsigned output_pins;
unsigned clear_outputs; unsigned clear_outputs;
unsigned transition_pins; int gpio_cd;
unsigned pci_irq; int gpio_rdy;
struct pcmcia_irqs *pcmcia_irqs;
unsigned pcmcia_irqs_size;
}; };
static struct nanoengine_pins nano_skts[] = { static struct nanoengine_pins nano_skts[] = {
{ {
.input_pins = GPIO_PC_READY0 | GPIO_PC_CD0,
.output_pins = GPIO_PC_RESET0, .output_pins = GPIO_PC_RESET0,
.clear_outputs = GPIO_PC_RESET0, .clear_outputs = GPIO_PC_RESET0,
.transition_pins = NANOENGINE_IRQ_GPIO_PC_CD0, .gpio_cd = GPIO_PC_CD0,
.pci_irq = NANOENGINE_IRQ_GPIO_PC_READY0, .gpio_rdy = GPIO_PC_READY0,
.pcmcia_irqs = irqs_skt0,
.pcmcia_irqs_size = ARRAY_SIZE(irqs_skt0)
}, { }, {
.input_pins = GPIO_PC_READY1 | GPIO_PC_CD1,
.output_pins = GPIO_PC_RESET1, .output_pins = GPIO_PC_RESET1,
.clear_outputs = GPIO_PC_RESET1, .clear_outputs = GPIO_PC_RESET1,
.transition_pins = NANOENGINE_IRQ_GPIO_PC_CD1, .gpio_cd = GPIO_PC_CD1,
.pci_irq = NANOENGINE_IRQ_GPIO_PC_READY1, .gpio_rdy = GPIO_PC_READY1,
.pcmcia_irqs = irqs_skt1,
.pcmcia_irqs_size = ARRAY_SIZE(irqs_skt1)
} }
}; };
@ -83,28 +64,15 @@ static int nanoengine_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
if (i >= num_nano_pcmcia_sockets) if (i >= num_nano_pcmcia_sockets)
return -ENXIO; return -ENXIO;
GPDR &= ~nano_skts[i].input_pins;
GPDR |= nano_skts[i].output_pins; GPDR |= nano_skts[i].output_pins;
GPCR = nano_skts[i].clear_outputs; GPCR = nano_skts[i].clear_outputs;
irq_set_irq_type(nano_skts[i].transition_pins, IRQ_TYPE_EDGE_BOTH);
skt->socket.pci_irq = nano_skts[i].pci_irq;
return soc_pcmcia_request_irqs(skt, skt->stat[SOC_STAT_CD].gpio = nano_skts[i].gpio_cd;
nano_skts[i].pcmcia_irqs, nano_skts[i].pcmcia_irqs_size); skt->stat[SOC_STAT_CD].name = i ? "PC CD1" : "PC CD0";
} skt->stat[SOC_STAT_RDY].gpio = nano_skts[i].gpio_rdy;
skt->stat[SOC_STAT_RDY].name = i ? "PC RDY1" : "PC RDY0";
/* return 0;
* Release all resources.
*/
static void nanoengine_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
{
unsigned i = skt->nr;
if (i >= num_nano_pcmcia_sockets)
return;
soc_pcmcia_free_irqs(skt,
nano_skts[i].pcmcia_irqs, nano_skts[i].pcmcia_irqs_size);
} }
static int nanoengine_pcmcia_configure_socket( static int nanoengine_pcmcia_configure_socket(
@ -138,25 +106,11 @@ static int nanoengine_pcmcia_configure_socket(
static void nanoengine_pcmcia_socket_state( static void nanoengine_pcmcia_socket_state(
struct soc_pcmcia_socket *skt, struct pcmcia_state *state) struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
{ {
unsigned long levels = GPLR;
unsigned i = skt->nr; unsigned i = skt->nr;
if (i >= num_nano_pcmcia_sockets) if (i >= num_nano_pcmcia_sockets)
return; return;
memset(state, 0, sizeof(struct pcmcia_state));
switch (i) {
case 0:
state->ready = (levels & GPIO_PC_READY0) ? 1 : 0;
state->detect = !(levels & GPIO_PC_CD0) ? 1 : 0;
break;
case 1:
state->ready = (levels & GPIO_PC_READY1) ? 1 : 0;
state->detect = !(levels & GPIO_PC_CD1) ? 1 : 0;
break;
default:
return;
}
state->bvd1 = 1; state->bvd1 = 1;
state->bvd2 = 1; state->bvd2 = 1;
state->wrprot = 0; /* Not available */ state->wrprot = 0; /* Not available */
@ -164,46 +118,13 @@ static void nanoengine_pcmcia_socket_state(
state->vs_Xv = 0; state->vs_Xv = 0;
} }
/*
* Enable card status IRQs on (re-)initialisation. This can
* be called at initialisation, power management event, or
* pcmcia event.
*/
static void nanoengine_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
{
unsigned i = skt->nr;
if (i >= num_nano_pcmcia_sockets)
return;
soc_pcmcia_enable_irqs(skt,
nano_skts[i].pcmcia_irqs, nano_skts[i].pcmcia_irqs_size);
}
/*
* Disable card status IRQs on suspend.
*/
static void nanoengine_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{
unsigned i = skt->nr;
if (i >= num_nano_pcmcia_sockets)
return;
soc_pcmcia_disable_irqs(skt,
nano_skts[i].pcmcia_irqs, nano_skts[i].pcmcia_irqs_size);
}
static struct pcmcia_low_level nanoengine_pcmcia_ops = { static struct pcmcia_low_level nanoengine_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = nanoengine_pcmcia_hw_init, .hw_init = nanoengine_pcmcia_hw_init,
.hw_shutdown = nanoengine_pcmcia_hw_shutdown,
.configure_socket = nanoengine_pcmcia_configure_socket, .configure_socket = nanoengine_pcmcia_configure_socket,
.socket_state = nanoengine_pcmcia_socket_state, .socket_state = nanoengine_pcmcia_socket_state,
.socket_init = nanoengine_pcmcia_socket_init,
.socket_suspend = nanoengine_pcmcia_socket_suspend,
}; };
int pcmcia_nanoengine_init(struct device *dev) int pcmcia_nanoengine_init(struct device *dev)