From patchwork Tue Nov 25 19:09:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5382361 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 188AA9F39D for ; Tue, 25 Nov 2014 19:15:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 73003201F4 for ; Tue, 25 Nov 2014 19:15:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BFB48201ED for ; Tue, 25 Nov 2014 19:15:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XtLXZ-0006RZ-Jf; Tue, 25 Nov 2014 19:12:45 +0000 Received: from mail-wg0-x233.google.com ([2a00:1450:400c:c00::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XtLVy-0005ZN-1U for linux-arm-kernel@lists.infradead.org; Tue, 25 Nov 2014 19:11:06 +0000 Received: by mail-wg0-f51.google.com with SMTP id k14so1716492wgh.24 for ; Tue, 25 Nov 2014 11:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aRXS0UELs/2kv+I3NRMjH/ZlZBsyzByOgBJnRvxI1Z0=; b=BACdpV00VmH4GM1/6kOMQUZEPSuGNcsgl6RLCI7hvEMZd1JbVYjOH1P5bjICu6qg2Z 2n1XQPrpJ+4r9a+UXnCbjIDE7Ljp/KuQvbrJJgzZfeLlXVWksCWLQiXxouUCBmo/hnT3 tT8ry8e+wXrXxS2Pf6WtH1GpiqDrLi7ORlw+LOWGd4uCn7q/YQlot+KXaV6tedXGgL/1 QhDGfNn3xL43fJyiSRTyc9jRjGi1ebDxEOi6LtsZpHKNVTtpni9hoD+aLh8q5pGP/eTQ 6qsQlEf/kIEbe29nUIiCzeMiIZJf9CYfZUhHt1RPDyqe6TuvbWw+tO3nYKrzrCL42MO2 8CRQ== X-Received: by 10.181.12.17 with SMTP id em17mr34609673wid.45.1416942643190; Tue, 25 Nov 2014 11:10:43 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id ud1sm3131966wjc.7.2014.11.25.11.10.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Nov 2014 11:10:42 -0800 (PST) From: Dmitry Eremin-Solenikov To: Russell King Subject: [PATCH v2 6/8] ARM: sa1100: merge GPIO multiplexer IRQ to "normal" irq domain Date: Tue, 25 Nov 2014 22:09:50 +0300 Message-Id: <1416942592-23059-7-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1416942592-23059-1-git-send-email-dbaryshkov@gmail.com> References: <1416942592-23059-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141125_111106_253268_38941B2E X-CRM114-Status: GOOD ( 11.04 ) X-Spam-Score: -0.8 (/) Cc: Linus Walleij , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IRQ_GPIO11_27 is a shared IRQ receiving IRQs from "high" GPIOs. It is still handled by sa1100_normal_chip, so there is no point to exclude it from "normal" irq domain. The IRQF_VALID flag set by domain map function will be cleared by irq_set_chained_handler() internally. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/mach-sa1100/irq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c index 2d8be03..14a7633e 100644 --- a/arch/arm/mach-sa1100/irq.c +++ b/arch/arm/mach-sa1100/irq.c @@ -387,7 +387,7 @@ void __init sa1100_init_irq(void) &sa1100_low_gpio_irqdomain_ops, NULL); sa1100_normal_irqdomain = irq_domain_add_legacy(NULL, - 20, IRQ_LCD, 12, + 21, IRQ_GPIO11_27, 11, &sa1100_normal_irqdomain_ops, NULL); sa1100_high_gpio_irqdomain = irq_domain_add_legacy(NULL, @@ -397,7 +397,6 @@ void __init sa1100_init_irq(void) /* * Install handler for GPIO 11-27 edge detect interrupts */ - irq_set_chip(IRQ_GPIO11_27, &sa1100_normal_chip); irq_set_chained_handler(IRQ_GPIO11_27, sa1100_high_gpio_handler); set_handle_irq(sa1100_handle_irq);