Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9bb5a4b authored by Russell King's avatar Russell King
Browse files

PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management 



Convert all the PXA platform socket drivers to use the new irq/gpio
management provided by soc_common.  This relieves these drivers from
having to do anything with these GPIOs other than provide the numbers
to soc_common.

Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d9dc8787

arch/arm/mach-pxa/include/mach/balloon3.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ enum balloon3_features { 


#define BALLOON3_AUX_NIRQ	PXA_GPIO_TO_IRQ(BALLOON3_GPIO_AUX_NIRQ)

#define BALLOON3_CODEC_IRQ	PXA_GPIO_TO_IRQ(BALLOON3_GPIO_CODEC_IRQ)

#define BALLOON3_S0_CD_IRQ	PXA_GPIO_TO_IRQ(BALLOON3_GPIO_S0_CD)



#define BALLOON3_NR_IRQS	(IRQ_BOARD_START + 16)

drivers/pcmcia/pxa2xx_balloon3.c

+5 −16
Original line number Diff line number Diff line
@@ -29,15 +29,6 @@ 


#include "soc_common.h"



/*

 * These are a list of interrupt sources that provokes a polled

 * check of status

 */

static struct pcmcia_irqs irqs[] = {

	{ 0, BALLOON3_S0_CD_IRQ, "PCMCIA0 CD" },

	{ 0, BALLOON3_BP_NSTSCHG_IRQ, "PCMCIA0 STSCHG" },

};



static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	uint16_t ver;
@@ -49,12 +40,12 @@ static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
			ver);



	skt->socket.pci_irq = BALLOON3_BP_CF_NRDY_IRQ;

	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));

}

	skt->stat[SOC_STAT_CD].gpio = BALLOON3_GPIO_S0_CD;

	skt->stat[SOC_STAT_CD].name = "PCMCIA0 CD";

	skt->stat[SOC_STAT_BVD1].irq = BALLOON3_BP_NSTSCHG_IRQ;

	skt->stat[SOC_STAT_BVD1].name = "PCMCIA0 STSCHG";



static void balloon3_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)

{

	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

	return 0;

}



static unsigned long balloon3_pcmcia_status[2] = {
@@ -85,7 +76,6 @@ static void balloon3_pcmcia_socket_state(struct soc_pcmcia_socket *skt, 
			disable_irq(BALLOON3_BP_NSTSCHG_IRQ);

	}



	state->detect	= !gpio_get_value(BALLOON3_GPIO_S0_CD);

	state->ready	= !!(status & BALLOON3_CF_nIRQ);

	state->bvd1	= !!(status & BALLOON3_CF_nSTSCHG_BVD1);

	state->bvd2	= 0;	/* not available */
@@ -106,7 +96,6 @@ static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
static struct pcmcia_low_level balloon3_pcmcia_ops = {

	.owner			= THIS_MODULE,

	.hw_init		= balloon3_pcmcia_hw_init,

	.hw_shutdown		= balloon3_pcmcia_hw_shutdown,

	.socket_state		= balloon3_pcmcia_socket_state,

	.configure_socket	= balloon3_pcmcia_configure_socket,

	.first			= 0,

drivers/pcmcia/pxa2xx_cm_x255.c

+12 −26
Original line number Diff line number Diff line
@@ -25,17 +25,6 @@ 
#define GPIO_PCMCIA_S1_RDYINT	(8)

#define GPIO_PCMCIA_RESET	(9)



#define PCMCIA_S0_CD_VALID	gpio_to_irq(GPIO_PCMCIA_S0_CD_VALID)

#define PCMCIA_S1_CD_VALID	gpio_to_irq(GPIO_PCMCIA_S1_CD_VALID)

#define PCMCIA_S0_RDYINT	gpio_to_irq(GPIO_PCMCIA_S0_RDYINT)

#define PCMCIA_S1_RDYINT	gpio_to_irq(GPIO_PCMCIA_S1_RDYINT)





static struct pcmcia_irqs irqs[] = {

	{ .sock = 0, .str = "PCMCIA0 CD" },

	{ .sock = 1, .str = "PCMCIA1 CD" },

};



static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	int ret = gpio_request(GPIO_PCMCIA_RESET, "PCCard reset");
@@ -43,19 +32,23 @@ static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
		return ret;

	gpio_direction_output(GPIO_PCMCIA_RESET, 0);



	skt->socket.pci_irq = skt->nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;

	irqs[0].irq = PCMCIA_S0_CD_VALID;

	irqs[1].irq = PCMCIA_S1_CD_VALID;

	ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));

	if (!ret)

		gpio_free(GPIO_PCMCIA_RESET);

	if (skt->nr == 0) {

		skt->stat[SOC_STAT_CD].gpio = GPIO_PCMCIA_S0_CD_VALID;

		skt->stat[SOC_STAT_CD].name = "PCMCIA0 CD";

		skt->stat[SOC_STAT_RDY].gpio = GPIO_PCMCIA_S0_RDYINT;

		skt->stat[SOC_STAT_RDY].name = "PCMCIA0 RDY";

	} else {

		skt->stat[SOC_STAT_CD].gpio = GPIO_PCMCIA_S1_CD_VALID;

		skt->stat[SOC_STAT_CD].name = "PCMCIA1 CD";

		skt->stat[SOC_STAT_RDY].gpio = GPIO_PCMCIA_S1_RDYINT;

		skt->stat[SOC_STAT_RDY].name = "PCMCIA1 RDY";

	}



	return ret;

	return 0;

}



static void cmx255_pcmcia_shutdown(struct soc_pcmcia_socket *skt)

{

	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

	gpio_free(GPIO_PCMCIA_RESET);

}
@@ -63,13 +56,6 @@ static void cmx255_pcmcia_shutdown(struct soc_pcmcia_socket *skt) 
static void cmx255_pcmcia_socket_state(struct soc_pcmcia_socket *skt,

				       struct pcmcia_state *state)

{

	int cd = skt->nr ? GPIO_PCMCIA_S1_CD_VALID : GPIO_PCMCIA_S0_CD_VALID;

	int rdy = skt->nr ? GPIO_PCMCIA_S1_RDYINT : GPIO_PCMCIA_S0_RDYINT;



	state->detect = !gpio_get_value(cd);

	state->ready  = !!gpio_get_value(rdy);

	state->bvd1   = 1;

	state->bvd2   = 1;

	state->vs_3v  = 0;

	state->vs_Xv  = 0;

	state->wrprot = 0;  /* not available */

drivers/pcmcia/pxa2xx_cm_x270.c

+4 −18
Original line number Diff line number Diff line
@@ -22,14 +22,6 @@ 
#define GPIO_PCMCIA_S0_RDYINT	(82)

#define GPIO_PCMCIA_RESET	(53)



#define PCMCIA_S0_CD_VALID	gpio_to_irq(GPIO_PCMCIA_S0_CD_VALID)

#define PCMCIA_S0_RDYINT	gpio_to_irq(GPIO_PCMCIA_S0_RDYINT)





static struct pcmcia_irqs irqs[] = {

	{ .sock = 0, .str = "PCMCIA0 CD" },

};



static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	int ret = gpio_request(GPIO_PCMCIA_RESET, "PCCard reset");
@@ -37,18 +29,16 @@ static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
		return ret;

	gpio_direction_output(GPIO_PCMCIA_RESET, 0);



	skt->socket.pci_irq = PCMCIA_S0_RDYINT;

	irqs[0].irq = PCMCIA_S0_CD_VALID;

	ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));

	if (!ret)

		gpio_free(GPIO_PCMCIA_RESET);

	skt->stat[SOC_STAT_CD].gpio = GPIO_PCMCIA_S0_CD_VALID;

	skt->stat[SOC_STAT_CD].name = "PCMCIA0 CD";

	skt->stat[SOC_STAT_RDY].gpio = GPIO_PCMCIA_S0_RDYINT;

	skt->stat[SOC_STAT_RDY].name = "PCMCIA0 RDY";



	return ret;

}



static void cmx270_pcmcia_shutdown(struct soc_pcmcia_socket *skt)

{

	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

	gpio_free(GPIO_PCMCIA_RESET);

}
@@ -56,10 +46,6 @@ static void cmx270_pcmcia_shutdown(struct soc_pcmcia_socket *skt) 
static void cmx270_pcmcia_socket_state(struct soc_pcmcia_socket *skt,

				       struct pcmcia_state *state)

{

	state->detect = (gpio_get_value(GPIO_PCMCIA_S0_CD_VALID) == 0) ? 1 : 0;

	state->ready  = (gpio_get_value(GPIO_PCMCIA_S0_RDYINT) == 0) ? 0 : 1;

	state->bvd1   = 1;

	state->bvd2   = 1;

	state->vs_3v  = 0;

	state->vs_Xv  = 0;

	state->wrprot = 0;  /* not available */

drivers/pcmcia/pxa2xx_colibri.c

+2 −18
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ static struct gpio colibri_pcmcia_gpios[] = { 
	{ 0,	GPIOF_INIT_HIGH,"PCMCIA Reset" },

};



static struct pcmcia_irqs colibri_irqs[] = {

	{

		.sock = 0,

		.str  = "PCMCIA CD"

	},

};



static int colibri_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	int ret;
@@ -69,19 +62,10 @@ static int colibri_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
	if (ret)

		goto err1;



	colibri_irqs[0].irq = gpio_to_irq(colibri_pcmcia_gpios[DETECT].gpio);

	skt->socket.pci_irq = gpio_to_irq(colibri_pcmcia_gpios[READY].gpio);

	skt->stat[SOC_STAT_CD].irq = gpio_to_irq(colibri_pcmcia_gpios[DETECT].gpio);

	skt->stat[SOC_STAT_CD].name = "PCMCIA CD";



	ret = soc_pcmcia_request_irqs(skt, colibri_irqs,

					ARRAY_SIZE(colibri_irqs));

	if (ret)

		goto err2;



	return ret;



err2:

	gpio_free_array(colibri_pcmcia_gpios,

			ARRAY_SIZE(colibri_pcmcia_gpios));

err1:

	return ret;

}