From patchwork Sat Dec 1 14:56:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 10707721 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57BCE13BB for ; Sat, 1 Dec 2018 14:56:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 466D32D773 for ; Sat, 1 Dec 2018 14:56:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 392BC2D77D; Sat, 1 Dec 2018 14:56:45 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8CCBD2D773 for ; Sat, 1 Dec 2018 14:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=IVsqwYNOzvP1SZtkT7dspQFQ7oBQ1qyk5rwNneCKURA=; b=ZXMlsCJshbUZ8p xHl8QvSpX089LzFx5VdVevvb8Y+AiMQgLXk+6ERfHd1iYQjCdwrsOXNp1+xJ12ANlwiTeyxAu3HGG VmehpQ5wh1RS7J2Jkt2FxVCyDvzjnoPFoHsF142qz0g9730eQ/XrlF48mH3op1rmhMw7JW+06Kp5O uqT5mXAoQ/hTwbdxPJqW9gl8iRZoxITeU6i1g4MDsAjx3LI8KNt6PXn2xmJaDksYNVybec1SHGjj7 lv/FVbrjVKnahrA+xccPBN1C698aInrEoumCvAAPrQnhR7umbGwTeZ4DLa54Ip7hKKajBDRXeUuuC wmYyoWnfwGE6U+w0oO9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gT6hE-0004r4-Jy; Sat, 01 Dec 2018 14:56:40 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gT6hA-0004og-PK for linux-arm-kernel@lists.infradead.org; Sat, 01 Dec 2018 14:56:38 +0000 Received: by mail-wm1-x342.google.com with SMTP id r11-v6so1666218wmb.2 for ; Sat, 01 Dec 2018 06:56:25 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=f1aw61VNM/PxG3kVDeoSIwuDnKI5aYcJZ7bCDLHHWsk=; b=VyOTRISCLaeQE9NuoMvzMLAXax26OcYT03Xb0YZr95LCm4F6joiUqoDREN8gzerfjk GDY/As24oNQkNuUV2DWS7CAzNVQNBylQytvAq/Al88MWjfX8zbAuVNnQyCanOrA0EHi/ t6CnDNSq5mwcW1JQH4J9/uOoOLhK33cdlYg+b48iTC4oPSaRFRNptiiNS3i2jUsU8Wp0 mdr3E72CV/vjjXGrVL45k/GVKBnRotclGFNiZbtJShsYYdJIurxis9Fhand9PqB1kVmx nAuNP6+iqZR+4BFq2QBWRgbggaPayeZxj68IEPUzarlU2gP3QXCXe1ERzZi5cCfinpwy bCxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=f1aw61VNM/PxG3kVDeoSIwuDnKI5aYcJZ7bCDLHHWsk=; b=qWskWjgl/y9MASke0MIF7z7fuF27hry6tGoAHbcnM17s7HFgAcNo+QDDTMp/VSdPYY 9jeWpldwctGM3xMUMM57FE3b+zid7367MsBHS8KAsLRxxcINbaK2dxjGJSO1vjNacDaF LnX8bh8BIYo/j/6VmN4siclC7TVpV1+Ok7sG/u2ntBf5Rk3qvNbPsc2KEd0FcBdQUgG0 YCPrrMU0HTCQ7jJRgae441Of1OJVp45ktLW6voHWChV9yxBbqeAsdjYQgMYlt0BM9tYS A3oshxJGgBq7KRipaoR5cm3w3KXL0zRnRLhk7Ndl3D07UKjOFC23kQBhhYDHs7ocP0yy BfCg== X-Gm-Message-State: AA+aEWZ9As/Oro+84wYx0QdChqbsFL364RUWI/2XHjBZGF4E3b2rDVR7 GzVhub3tTEMtIEb7usvltBXvYg== X-Google-Smtp-Source: AFSGD/VguIg22D4lggkoaTiXrItoxJp1U0QsNzqz5gSsCnAeKebzLz+yja9em4K72GEU1laURrQz/g== X-Received: by 2002:a1c:68d7:: with SMTP id d206mr2381921wmc.43.1543676184514; Sat, 01 Dec 2018 06:56:24 -0800 (PST) Received: from localhost.localdomain ([104.207.76.73]) by smtp.gmail.com with ESMTPSA id c129sm1626731wma.48.2018.12.01.06.56.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Dec 2018 06:56:23 -0800 (PST) From: Carlo Caione To: robh+dt@kernel.org, mark.rutland@arm.com, khilman@baylibre.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, jbrunet@baylibre.com Subject: [PATCH] arm64: dts: meson-axg: Fix and enable GPIO interrupt controller Date: Sat, 1 Dec 2018 14:56:14 +0000 Message-Id: <20181201145614.5381-1-ccaione@baylibre.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181201_065636_882889_CB832ABF X-CRM114-Status: GOOD ( 12.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlo Caione 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 The GPIO interrupt controller registers are mapped to the wrong offset in the DTSI. Fix the offset in the DTSI and enable the interrupt controller in the DTS of the only AXG board enabled. Signed-off-by: Carlo Caione --- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 ++++++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 18778ada7bd3..c3e4aac75782 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -374,6 +374,12 @@ status = "okay"; }; +&gpio_intc { + compatible = "amlogic,meson-gpio-intc", + "amlogic,meson-axg-gpio-intc"; + status = "okay"; +}; + &ir { status = "okay"; pinctrl-0 = <&remote_input_ao_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index df017dbd2e57..f1affc12e3e6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1415,7 +1415,7 @@ gpio_intc: interrupt-controller@f080 { compatible = "amlogic,meson-gpio-intc"; - reg = <0x0 0xf080 0x0 0x10>; + reg = <0x0 0x9880 0x0 0x10>; interrupt-controller; #interrupt-cells = <2>; amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;