From patchwork Thu Sep 20 12:12:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11545 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D95761B4E37 for ; Thu, 20 Sep 2012 12:13:18 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 38D8B3D098F4 for ; Thu, 20 Sep 2012 12:13:18 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2722067iej.11 for ; Thu, 20 Sep 2012 05:13:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gxdwClOPSrZIGIRd3mdEw48VZ984ZrcXmwPdMQ1pDL8=; b=LOa6sehVbzN8h6r2VtRO/eStbVX+huLDoHNX5nWxwmGC/EkaRhCYj1FRdnW+3TnRpf 9uXsAtrX9FAD5v+drEnH5JbNuV7WR2dBgTbPp6I5jW79vWSM4LDEsPOMvzmoTaHVrsvl AfpgCN7dOJviq4uy1IEN0T9xQzm7A4jMg2j3MckZPDHjKjITPUL4gDJm826lAO9wdkj5 M68k0nZOokpBAddEKlW4QZQhfk/YcKRMIbR+T8tk3NjLPs8/zRM3AEAhDt25XlsxLHkv /I98KA8a1hOiZMM4liD4jbeQo3oHj2UkSypcaNCqJyAYQpgp5286mI96/6WFtdtolgNm KHHA== Received: by 10.50.184.129 with SMTP id eu1mr1526051igc.0.1348143197974; Thu, 20 Sep 2012 05:13:17 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp71595igc; Thu, 20 Sep 2012 05:13:17 -0700 (PDT) Received: by 10.216.238.30 with SMTP id z30mr1032178weq.223.1348143196338; Thu, 20 Sep 2012 05:13:16 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id e51si7287379wej.148.2012.09.20.05.13.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f172.google.com with SMTP id hi8so442456wib.13 for ; Thu, 20 Sep 2012 05:13:15 -0700 (PDT) Received: by 10.216.144.71 with SMTP id m49mr1155455wej.23.1348143195846; Thu, 20 Sep 2012 05:13:15 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id w7sm32394460wiz.0.2012.09.20.05.13.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:15 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, olof.johansson@gmail.com, Lee Jones Subject: [PATCH 08/32] Revert "input: ab8500-ponkey: Create AB8500 domain IRQ mapping" Date: Thu, 20 Sep 2012 14:12:26 +0200 Message-Id: <1348143170-2130-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> References: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlkLtJM7hF86tpJNHZ3XGSKfWrWsLiVXq08WZgfDHAg1+s1jKfgRtrGCj1cMpsuHsXVIsSs This reverts commit ca3b3faf9bee4dc5df4f10eae2d1e48f7de0a8ad. There was a plan to place ab8500_irq_get_virq() calls in each AB8500 child device prior to requesting an IRQ, but as we're no longer using Device Tree to collect our IRQ numbers, it's actually better to allow the core to do this during device registration time. So the IRQ number we pull from its resource has already been converted to a virtual IRQ. Acked-by: Dmitry Torokhov Acked-by: Linus Walleij Signed-off-by: Lee Jones --- 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 f06231b..84ec691 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 = ab8500_irq_get_virq(ab8500, irq_dbf); - ponkey->irq_dbr = ab8500_irq_get_virq(ab8500, irq_dbr); + ponkey->irq_dbf = irq_dbf; + ponkey->irq_dbr = irq_dbr; input->name = "AB8500 POn(PowerOn) Key"; input->dev.parent = &pdev->dev;