diff mbox

[7/9] Input: ab8500-ponkey: Create AB8500 domain IRQ mapping

Message ID 5003C449.6000806@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Lee Jones July 16, 2012, 7:35 a.m. UTC 
> I think it would be best if this got merged through whatever tree that
> was used to introduce ab8500_irq_get_virq(); otherwise it will have to
> wait till I resync with mainline sometime in the middle of the next
> release cycle.

I agree. Sam that's you, patch below. :)

From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 26 Jun 2012 10:46:50 +0100
Subject: [PATCH 1/1] Input: ab8500-ponkey: Create AB8500 domain IRQ mapping

Before we can use any domain allocated IRQ, we need to first create a
map between the Hardware IRQ (hwirq) and the Linux Virtual IRQ (virq).
We do this with a helper function provided by the AB8500 IRQ domain
controller called ab8500_irq_get_virq(). We need to do this for both
IRQs which the Power-On-Key driver uses; one for button press, the other
for button depress.

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/input/misc/ab8500-ponkey.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Samuel Ortiz July 16, 2012, 1:57 p.m. UTC | #1 
Hi Lee,

On Mon, Jul 16, 2012 at 08:35:37AM +0100, Lee Jones wrote:
> > I think it would be best if this got merged through whatever tree that
> > was used to introduce ab8500_irq_get_virq(); otherwise it will have to
> > wait till I resync with mainline sometime in the middle of the next
> > release cycle.
> 
> I agree. Sam that's you, patch below. :)
Applied, thanks.

Cheers,
Samuel.
diff mbox

Patch

diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index 350fd0c..1a1d974 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -73,8 +73,8 @@  static int __devinit ab8500_ponkey_probe(struct platform_device *pdev)
 
 	ponkey->idev = input;
 	ponkey->ab8500 = ab8500;
-	ponkey->irq_dbf = irq_dbf;
-	ponkey->irq_dbr = irq_dbr;
+	ponkey->irq_dbf = ab8500_irq_get_virq(ab8500, irq_dbf);
+	ponkey->irq_dbr = ab8500_irq_get_virq(ab8500, irq_dbr);
 
 	input->name = "AB8500 POn(PowerOn) Key";
 	input->dev.parent = &pdev->dev;