From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Tue, 10 Jul 2012 08:22:34 +0200 Subject: [PATCH 7/9] Input: ab8500-ponkey: Create AB8500 domain IRQ mapping In-Reply-To: <20120710061757.GB29257@core.coreip.homeip.net> References: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> <4FF6994B.9040801@linaro.org> <20120706173957.GA10202@core.coreip.homeip.net> <4FFB288D.4080606@linaro.org> <20120709201422.GA12242@core.coreip.homeip.net> <4FFB40A4.5060505@linaro.org> <20120709204620.GA12692@core.coreip.homeip.net> <4FFB463F.9040201@linaro.org> <20120710061757.GB29257@core.coreip.homeip.net> Message-ID: <4FFBCA2A.6080400@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 10/07/12 08:17, Dmitry Torokhov wrote: > On Mon, Jul 09, 2012 at 10:59:43PM +0200, Lee Jones wrote: >> Sorry for the cock-up(s). >> >> From: Lee Jones >> 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. >> >> Signed-off-by: Lee Jones > > Acked-by: Dmitry Torokhov > > 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. > > Thanks. No problem. I'll send it though ARM-SoC. >> --- >> drivers/input/misc/ab8500-ponkey.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c >> index 5ceb23e..f6764af 100644 >> --- a/drivers/input/misc/ab8500-ponkey.c >> +++ b/drivers/input/misc/ab8500-ponkey.c >> @@ -74,8 +74,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; >> -- >> 1.7.9.5 >> >> >> > -- Lee Jones Linaro ST-Ericsson Landing Team Lead M: +44 77 88 633 515 Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog