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

Commit d7bd1b8a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'drivers/pxa-gpio' into next/drivers 

* drivers/pxa-gpio:
  Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
parents a4611783 b5d798cc

drivers/input/touchscreen/zylonite-wm97xx.c

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/io.h>
@@ -192,8 +193,8 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev) 
	else

		gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);



	wm->pen_irq = IRQ_GPIO(gpio_touch_irq);

	irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);

	wm->pen_irq = gpio_to_irq(gpio_touch_irq);

	irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);



	wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,

			   WM97XX_GPIO_POL_HIGH,

drivers/pcmcia/pxa2xx_e740.c

+7 −4
Original line number Diff line number Diff line
@@ -26,20 +26,23 @@ 
static struct pcmcia_irqs cd_irqs[] = {

	{

		.sock = 0,

		.irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD0),

		.str  = "CF card detect"

	},

	{

		.sock = 1,

		.irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD1),

		.str  = "Wifi switch"

	},

};



static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	skt->socket.pci_irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) :

				IRQ_GPIO(GPIO_E740_PCMCIA_RDY1);

	if (skt->nr == 0)

		skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY0);

	else

		skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY1);



	cd_irqs[0].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD0);

	cd_irqs[1].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD1);



	return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1);

}

drivers/pcmcia/pxa2xx_palmld.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
	ret = gpio_request_array(palmld_pcmcia_gpios,

				ARRAY_SIZE(palmld_pcmcia_gpios));



	skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);

	skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMLD_PCMCIA_READY);



	return ret;

}

drivers/pcmcia/pxa2xx_palmtc.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
	ret = gpio_request_array(palmtc_pcmcia_gpios,

				ARRAY_SIZE(palmtc_pcmcia_gpios));



	skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);

	skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTC_PCMCIA_READY);



	return ret;

}

drivers/pcmcia/pxa2xx_stargate2.c

+4 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#define SG2_S0_GPIO_READY	81



static struct pcmcia_irqs irqs[] = {

	{ 0, IRQ_GPIO(SG2_S0_GPIO_DETECT), "PCMCIA0 CD" },

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

};



static struct gpio sg2_pcmcia_gpios[] = {
@@ -44,7 +44,9 @@ static struct gpio sg2_pcmcia_gpios[] = { 


static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);

	skt->socket.pci_irq = gpio_to_irq(SG2_S0_GPIO_READY);

	irqs[0].irq = gpio_to_irq(SG2_S0_GPIO_DETECT);



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

}