From patchwork Thu May 8 12:44:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 29837 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 349C4202DD for ; Thu, 8 May 2014 12:44:41 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id sa20sf7876061veb.5 for ; Thu, 08 May 2014 05:44:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:date :message-id:subject:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=GMEbZDNwQ8RLvHzJpy/RUfPkCiNQ0mU1dZuri+seZVI=; b=PSM+6Mpx5wMvyYdyJWYiZdq9Vw/TCAqB3OBBtWYrp5vYeiiN13UgBdNTbWrDFuE1o2 SFscHZNhBJShxrG2w8OIs6i1YlHY+iVlNnlNltRGzEoVuq7HzWB+Kjd5Mk3HiS4/XvCp YHQUB5SMHLEZ4qZxqEotBLV1hW9KOnH9EeYCHfg/QTBHMJa4i1tyOBAYWgGvTjd//OX8 6DmPiuhiHXr1ihVCXSo3PzlVv9hLGHHv5egvphW+TLGzZ6gef9jVKippAOE4/a8eq3VW FLCOOlBIekxrm/assLbX9iTa1ygiTYlNzkw2etfywTJxI/nKHm5vU3F//LUqWBIQYvh4 J77Q== X-Gm-Message-State: ALoCoQlCuA546vCY2lRKHZY4u2L2qiS7Dzj9axkQiOWcEUqs2d4Db+CkY2KOXDOP7LmieaxTyxnR X-Received: by 10.236.171.169 with SMTP id r29mr1347186yhl.32.1399553080922; Thu, 08 May 2014 05:44:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.115 with SMTP id i106ls3769427qgd.97.gmail; Thu, 08 May 2014 05:44:40 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr2673759vcb.6.1399553080754; Thu, 08 May 2014 05:44:40 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id uv3si153217vdc.149.2014.05.08.05.44.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 May 2014 05:44:40 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ld13so2604064vcb.26 for ; Thu, 08 May 2014 05:44:40 -0700 (PDT) X-Received: by 10.220.176.68 with SMTP id bd4mr417493vcb.70.1399553080579; Thu, 08 May 2014 05:44:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp397937vcb; Thu, 8 May 2014 05:44:40 -0700 (PDT) X-Received: by 10.60.176.39 with SMTP id cf7mr4127909oec.45.1399553080078; Thu, 08 May 2014 05:44:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ko6si462570pbc.356.2014.05.08.05.44.39; Thu, 08 May 2014 05:44:39 -0700 (PDT) Received-SPF: none (google.com: linux-input-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752756AbaEHMog (ORCPT ); Thu, 8 May 2014 08:44:36 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:37884 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbaEHMog (ORCPT ); Thu, 8 May 2014 08:44:36 -0400 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante.sirena.org.uk) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1WiNgW-00073N-5K; Thu, 08 May 2014 12:44:28 +0000 Received: from broonie by debutante.sirena.org.uk with local (Exim 4.82) (envelope-from ) id 1WiNgS-0005I7-5D; Thu, 08 May 2014 13:44:20 +0100 From: Mark Brown To: Russell King , Dmitry Torokhov Cc: linux-input@vger.kernel.org, linaro-kernel@lists.linaro.org, Liviu Dudau , Mark Brown Date: Thu, 8 May 2014 13:44:13 +0100 Message-Id: <1399553053-20305-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.0.rc2 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Subject: [PATCH] input: Request a shared interrupt for AMBA KMI devices. X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-input-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Liviu Dudau Recent ARM boards have the KMI devices share one interrupt line rather than having dedicated IRQs. Update the driver to take that into account. Signed-off-by: Liviu Dudau Signed-off-by: Mark Brown --- drivers/input/serio/ambakmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index 762b08432de0..8b748d99b934 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -79,7 +79,8 @@ static int amba_kmi_open(struct serio *io) writeb(divisor, KMICLKDIV); writeb(KMICR_EN, KMICR); - ret = request_irq(kmi->irq, amba_kmi_int, 0, "kmi-pl050", kmi); + ret = request_irq(kmi->irq, amba_kmi_int, IRQF_SHARED, "kmi-pl050", + kmi); if (ret) { printk(KERN_ERR "kmi: failed to claim IRQ%d\n", kmi->irq); writeb(0, KMICR);