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

Commit c66dc529 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Ben Dooks
Browse files

i2c-pxa2xx: add support for shared IRQ handler 



Sodaville has three of them on a single IRQ. IRQF_DISABLED is removed
because it is a NOP allready and scheduled for removal.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 7e94dd15

drivers/i2c/busses/i2c-pxa.c

+8 −2
Original line number Diff line number Diff line
@@ -956,11 +956,17 @@ static void i2c_pxa_irq_rxfull(struct pxa_i2c *i2c, u32 isr) 
	writel(icr, _ICR(i2c));

}



#define VALID_INT_SOURCE	(ISR_SSD | ISR_ALD | ISR_ITE | ISR_IRF | \

				ISR_SAD | ISR_BED)

static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id)

{

	struct pxa_i2c *i2c = dev_id;

	u32 isr = readl(_ISR(i2c));



	isr &= VALID_INT_SOURCE;

	if (!isr)

		return IRQ_NONE;



	if (i2c_debug > 2 && 0) {

		dev_dbg(&i2c->adap.dev, "%s: ISR=%08x, ICR=%08x, IBMR=%02x\n",

			__func__, isr, readl(_ICR(i2c)), readl(_IBMR(i2c)));
@@ -975,7 +981,7 @@ static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id) 
	/*

	 * Always clear all pending IRQs.

	 */

	writel(isr & (ISR_SSD|ISR_ALD|ISR_ITE|ISR_IRF|ISR_SAD|ISR_BED), _ISR(i2c));

	writel(isr, _ISR(i2c));



	if (isr & ISR_SAD)

		i2c_pxa_slave_start(i2c, isr);
@@ -1120,7 +1126,7 @@ static int i2c_pxa_probe(struct platform_device *dev) 
		i2c->adap.algo = &i2c_pxa_pio_algorithm;

	} else {

		i2c->adap.algo = &i2c_pxa_algorithm;

		ret = request_irq(irq, i2c_pxa_handler, IRQF_DISABLED,

		ret = request_irq(irq, i2c_pxa_handler, IRQF_SHARED,

				  i2c->adap.name, i2c);

		if (ret)

			goto ereqirq;