From patchwork Mon Dec 16 20:24:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris BREZILLON X-Patchwork-Id: 3356851 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0C297C0D4A for ; Mon, 16 Dec 2013 20:51:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 209152011E for ; Mon, 16 Dec 2013 20:51:33 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 9FF7820117 for ; Mon, 16 Dec 2013 20:51:31 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vsemh-0002cb-Qh; Mon, 16 Dec 2013 20:29:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vsem6-0005SR-80; Mon, 16 Dec 2013 20:28:22 +0000 Received: from 18.mo1.mail-out.ovh.net ([46.105.35.72] helo=mo1.mail-out.ovh.net) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vsem2-0005Pw-Gq for linux-arm-kernel@lists.infradead.org; Mon, 16 Dec 2013 20:28:19 +0000 Received: from mail436.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo1.mail-out.ovh.net (Postfix) with SMTP id 40F29FFB195 for ; Mon, 16 Dec 2013 21:31:33 +0100 (CET) Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 16 Dec 2013 22:28:41 +0200 Received: from cha74-5-78-236-240-82.fbx.proxad.net (HELO localhost.localdomain) (b.brezillon@overkiz.com@78.236.240.82) by ns0.ovh.net with SMTP; 16 Dec 2013 22:28:40 +0200 From: Boris BREZILLON To: Rob Landley , Nicolas Ferre , Jean-Christophe Plagniol-Villard , Russell King , Thomas Gleixner , Grant Likely Subject: [RFC PATCH 09/10] ARM: at91/dt: add new AIC irq mux definitions Date: Mon, 16 Dec 2013 21:24:20 +0100 Message-Id: <1387225461-6201-10-git-send-email-b.brezillon@overkiz.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387225461-6201-1-git-send-email-b.brezillon@overkiz.com> References: <1387225461-6201-1-git-send-email-b.brezillon@overkiz.com> X-Ovh-Tracer-Id: 7089510240338999403 X-Ovh-Remote: 78.236.240.82 (cha74-5-78-236-240-82.fbx.proxad.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeiledrleeiucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-Spam-Check: DONE|U 0.5/N X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeiledrleeiucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131216_152818_731859_61D8A53E X-CRM114-Status: GOOD ( 12.82 ) X-Spam-Score: -1.9 (-) Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Boris BREZILLON X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Add irq line muxing definition for sam9x5 SoCs. Signed-off-by: Boris BREZILLON --- arch/arm/boot/dts/at91sam9x5.dtsi | 111 ++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 40267a1..619e24a 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -68,6 +68,113 @@ interrupt-controller; reg = <0xfffff000 0x200>; atmel,external-irqs = <31>; + #address-cells = <1>; + #size-cells = <0>; + + sysc_irq_mux: irq-mux@1 { + compatible = "atmel,aic-mux"; + reg = <1>; + + dbgu_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&dbgu 0 0xc 0xc00002e3>; + }; + + pmc_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&pmc 0 0x64 0x7034b>; + }; + + pmecc_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&nand0 1 0x20 0x1>; + }; + + pmerrloc_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&nand0 2 0x18 0x1>; + }; + + pit_irq { + compatible = "atmel,aic-mux-1reg-irq"; + atmel,aic-mux-irq-reg = <&pit 0 0x0 0x2000000>; + }; + + wdt_irq { + compatible = "atmel,aic-mux-1reg-irq"; + atmel,aic-mux-irq-reg = <&wdt 0 0x4 0x1000>; + }; + + rtc_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&rtc 0 0x24 0x1f>; + }; + }; + + pioAB_irq_mux: irq-mux@2 { + compatible = "atmel,aic-mux"; + reg = <2>; + + pioA_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&pioA 0 0x44 0xffffffff>; + }; + + pioB_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&pioB 0 0x44 0xffffffff>; + }; + }; + + pioCD_irq_mux: irq-mux@3 { + compatible = "atmel,aic-mux"; + reg = <3>; + + pioC_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&pioC 0 0x44 0xffffffff>; + }; + + pioD_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&pioD 0 0x44 0xffffffff>; + }; + }; + + tcb_irq_mux: irq-mux@17 { + compatible = "atmel,aic-mux"; + reg = <17>; + + tc0_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&tcb0 0 0x28 0xff>; + }; + + tc1_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&tcb0 0 0x68 0xff>; + }; + + tc2_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&tcb0 0 0xa8 0xff>; + }; + + tc3_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&tcb1 0 0x28 0xff>; + }; + + tc4_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&tcb1 0 0x68 0xff>; + }; + + tc5_irq { + compatible = "atmel,aic-mux-3reg-irq"; + atmel,aic-mux-irq-reg = <&tcb1 0 0xa8 0xff>; + }; + }; }; ramc0: ramc@ffffe800 { @@ -750,13 +857,13 @@ }; }; - watchdog@fffffe40 { + wdt: watchdog@fffffe40 { compatible = "atmel,at91sam9260-wdt"; reg = <0xfffffe40 0x10>; status = "disabled"; }; - rtc@fffffeb0 { + rtc: rtc@fffffeb0 { compatible = "atmel,at91sam9x5-rtc"; reg = <0xfffffeb0 0x40>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;