From patchwork Wed Oct 19 15:21:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9384489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46C92608A7 for ; Wed, 19 Oct 2016 15:26:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 390A728517 for ; Wed, 19 Oct 2016 15:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D96D28BC7; Wed, 19 Oct 2016 15:26:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD14F28517 for ; Wed, 19 Oct 2016 15:26:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bwsic-0000rj-Ne; Wed, 19 Oct 2016 15:23:50 +0000 Received: from mail-qk0-x235.google.com ([2607:f8b0:400d:c09::235]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bwsh5-0008Qw-CW for linux-arm-kernel@lists.infradead.org; Wed, 19 Oct 2016 15:22:18 +0000 Received: by mail-qk0-x235.google.com with SMTP id z190so41112142qkc.2 for ; Wed, 19 Oct 2016 08:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PFSWunsH67ZpC9n/bvLCNt8Oj/YE5JHptblA569wBRw=; b=NaQiosWzuDdJ6Lp/GYiMjwBCTjC2WzcsGXdvGg+npBHtds92nUQvlgCfB01AFM5Eij DVy2gobl7ssw5nJGT1wySU7bu+OpY4uZ0gBxYm3WV4W29ruJQnMgNWssiL96AIRA8Idb PFX+blRQCUmQkIiQHgi/UyHGviHPjqr81BxDswGGoPhY9+C/zQpQbciHKxeGpedeCD14 RcqnBOlXqM/E1jKourNAOZcxhGHnzJoqCLAMYNiEWkCjoBLvuUqGLA/bPgSgbUZTPdcX e/cCfgdb7mKDTix4XkkJMs9v9SL2h92eyzaq1zpAfiBBfdZ2PT8k6SDd0jSa9b4vGpuw K/Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PFSWunsH67ZpC9n/bvLCNt8Oj/YE5JHptblA569wBRw=; b=WRhzrqkj4s79r+7awSo7OHPnQmPj1m4CVnjnAnr/4ifBDhmhWHqtZXUMRuu65ZlQM3 GeKogFVCFK5ROPi24YkyaXla2wBPVWfuhQ/LJPIiA/5NznmnFGdVuoCr7GAru3YcOD4u dtk8S0AnuGjDYWdsk5Bt4Nch/XGn3YVJdQnvhJNxnv0pJ5//XxT35veDoRzso01CJQuk nfzwEtvn3Pp3CC0I2uWN/6+SgMcyshRLUAHKVlu6ZrGwTyANsnu+ouFhjsv0bXoWzD1T ZsArXUiPE0AnXbgJ6dXHPS4WB5GTGRutDKmdRqP3z/PvKWrHLGDZL38YQYkI8IjGB4r0 9PdQ== X-Gm-Message-State: AA6/9Rkz/7ZOCegiNj5FWa9UQ/NHJMuzfTT4M9/ocIIdVGUSDcuZl4i23+Zf5UvXsXoZkuO9 X-Received: by 10.194.170.163 with SMTP id an3mr4791254wjc.73.1476890514138; Wed, 19 Oct 2016 08:21:54 -0700 (PDT) Received: from boomer.baylibre.com ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f2sm69725653wjr.2.2016.10.19.08.21.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Oct 2016 08:21:53 -0700 (PDT) From: Jerome Brunet To: Carlo Caione , Kevin Hilman Subject: [PATCH v2 9/9] ARM: dts: amlogic: enable gpio interrupt controller on meson8 Date: Wed, 19 Oct 2016 17:21:20 +0200 Message-Id: <1476890480-8884-10-git-send-email-jbrunet@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476890480-8884-1-git-send-email-jbrunet@baylibre.com> References: <1476890480-8884-1-git-send-email-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161019_082215_690237_A29EDE7F X-CRM114-Status: GOOD ( 10.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Jason Cooper , Marc Zyngier , Catalin Marinas , Linus Walleij , Will Deacon , linux-kernel@vger.kernel.org, Russell King , linux-gpio@vger.kernel.org, Rob Herring , linux-amlogic@lists.infradead.org, Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jerome Brunet --- arch/arm/boot/dts/meson8.dtsi | 11 +++++++++++ arch/arm/boot/dts/meson8b.dtsi | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 45619f6162c5..713a22456ff1 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -43,6 +43,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include +#include #include /include/ "meson.dtsi" @@ -91,6 +93,13 @@ clock-frequency = <141666666>; }; + gpio_interrupt: interrupt-controller@c1109880 { + compatible = "amlogic,meson8-gpio-intc"; + reg = <0xc1109880 0x10>; + interrupt-controller; + #interrupt-cells = <2>; + }; + pinctrl_cbus: pinctrl@c1109880 { compatible = "amlogic,meson8-cbus-pinctrl"; reg = <0xc1109880 0x10>; @@ -106,6 +115,7 @@ reg-names = "mux", "pull", "pull-enable", "gpio"; gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&gpio_interrupt>; }; spi_nor_pins: nor { @@ -148,6 +158,7 @@ reg-names = "mux", "pull", "gpio"; gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&gpio_interrupt>; }; uart_ao_a_pins: uart_ao_a { diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 41fd53671859..36a239a645f5 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -44,6 +44,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include +#include #include #include #include @@ -183,6 +185,13 @@ status = "disabled"; }; + gpio_interrupt: interrupt-controller@c1109880 { + compatible = "amlogic,meson8b-gpio-intc"; + reg = <0xc1109880 0x10>; + interrupt-controller; + #interrupt-cells = <2>; + }; + pinctrl_cbus: pinctrl@c1109880 { compatible = "amlogic,meson8b-cbus-pinctrl"; reg = <0xc1109880 0x10>; @@ -198,6 +207,7 @@ reg-names = "mux", "pull", "pull-enable", "gpio"; gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&gpio_interrupt>; }; }; @@ -215,6 +225,7 @@ reg-names = "mux", "pull", "gpio"; gpio-controller; #gpio-cells = <2>; + interrupt-parent = <&gpio_interrupt>; }; uart_ao_a_pins: uart_ao_a {