Message ID | 20171029231715.13391-3-martin.blumenstingl@googlemail.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org> 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 05E83603B5 for <patchwork-linux-amlogic@patchwork.kernel.org>; Sun, 29 Oct 2017 23:18:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED59728732 for <patchwork-linux-amlogic@patchwork.kernel.org>; Sun, 29 Oct 2017 23:18:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0D1028736; Sun, 29 Oct 2017 23:18:02 +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.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 9B6CB28732 for <patchwork-linux-amlogic@patchwork.kernel.org>; Sun, 29 Oct 2017 23:18:02 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=bcXFC5fXC1K0sQoBWvv9u+UEAItpYgj70tZzBgJTosc=; b=oO/Cel+d9kdoLhAKs1ehhVxx6q CUMjuTfR6DGK89MSN1tUY6GIzpjwjNoQ+HpOmEIpHH2JzLvj3BnNf1hA/Q70VkWvzn1FP/ZXUpRtB WIrl2nwEL8+if6h9HztpWBEjq7EnChGnTDNE2ZL1jUCWNE2Kvd0WZuLV7cvX76XeYQPDNKc0Jpgrs KaZ0/T8ORQPBHgUyUvbVxHBZi7EmvYK4B1pRCYIotNNSiehXy8kWltdx2N0Ez+KHTs6ZNjBa4LCDj Zn/GOXV6O4OMk9EQ4/XVscV+8mWp540rrht9yWELvFHFXb4jeJfowGR4csa6jCjU9Qq2h4AAnoe8u 1tFl+lJQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e8wq3-00028O-1J; Sun, 29 Oct 2017 23:17:55 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e8wpx-00022N-CH for linux-amlogic@lists.infradead.org; Sun, 29 Oct 2017 23:17:51 +0000 Received: by mail-wr0-x242.google.com with SMTP id w105so10871684wrc.0 for <linux-amlogic@lists.infradead.org>; Sun, 29 Oct 2017 16:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CS3UqA5897HMdWhTGKLNB3HICvMq47NJlHw9TZ0iO3A=; b=rdWMNm5japP9tHzuteP8cZcFvoF+uOxCVRjeL3PEIx7g0RKwwWZ8QoZn1IIhmXd6cB n2mnzE2eKzjJ/z614kdfBE6SrP2pLQEK58fcIdjPRdWQdohHtLk5+0XzKcP07iqETDyB xMj/7tzs6bacGvev3/o4r03K4FHnAcfSM2V9MCMX/0hf+7esLjezAoB0YXVeg8hU0Ods 7tdj6GJQ/T352Mn2VxxgBUca4f/1Joi3uyCzNHuIiJ0/OO1W/DQ2RKFIyyEivjaPbyyB Xth6I7k2QkXX1X1ih/79WNhdo9jbiv9syN+CoIl/ZnduyvUxs74iTpIacIyrhxY5tZzF cvLA== 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:in-reply-to :references; bh=CS3UqA5897HMdWhTGKLNB3HICvMq47NJlHw9TZ0iO3A=; b=YeQijCpcebGTC1gKm7CYHioWYC9QTT2k9UgAOJt9CAxbnQ15qHq1RXbvksJfwCKGw4 S8rip1sXiCDCkpWvPSq24p8LnArAOc+QP2cM1XSLxpek4/XnNbQDvDHqjoNo6orxsOAh UGYLNvKcfxAEMB5uR/C2Z2WKutA8dFCYv2zW8CtInkvqSrGfSkzZ2wPk1Rog7kYQ0boZ jD/DcH3uh4L5ZK1rKUjRlpoqIPvu9GR9iPd9SKusZN/DQe58HPTy2kPWsDwZyQIiQTk+ SHGb8gVvXSjDjWBHC+ZcwxDoq/Zvq0VLnzCVLq9Px3eW0j3niJV9V75CNnZtnxluIUT6 hiEQ== X-Gm-Message-State: AMCzsaW/s6kYM5wvxA1JuRhvZovAKr8gjk+T2LCVh1SSwTlmDM4X6RsG O4fayNxDjqwlOaufvPZ+x/JyfjXM X-Google-Smtp-Source: ABhQp+RHGHj1JnxcC0Ylg+o2Qsem2nbovCNDzJ+27hvH8XceCGElIOxJfE+akPaxUCiGYZqhcXgFQw== X-Received: by 10.223.189.14 with SMTP id j14mr6219607wrh.141.1509319047531; Sun, 29 Oct 2017 16:17:27 -0700 (PDT) Received: from blackbox.darklights.net (p5DE386B3.dip0.t-ipconnect.de. [93.227.134.179]) by smtp.googlemail.com with ESMTPSA id k30sm25863333wrf.52.2017.10.29.16.17.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Oct 2017 16:17:26 -0700 (PDT) From: Martin Blumenstingl <martin.blumenstingl@googlemail.com> To: khilman@baylibre.com, linux-amlogic@lists.infradead.org Subject: [PATCH 2/2] ARM: dts: meson: fix the memory region of the GPIO interrupt controller Date: Mon, 30 Oct 2017 00:17:15 +0100 Message-Id: <20171029231715.13391-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171029231715.13391-1-martin.blumenstingl@googlemail.com> References: <20171029231715.13391-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171029_161749_566926_A502342A X-CRM114-Status: UNSURE ( 9.92 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-amlogic.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-amlogic>, <mailto:linux-amlogic-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-amlogic/> List-Post: <mailto:linux-amlogic@lists.infradead.org> List-Help: <mailto:linux-amlogic-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-amlogic>, <mailto:linux-amlogic-request@lists.infradead.org?subject=subscribe> Cc: carlo@caione.org, Martin Blumenstingl <martin.blumenstingl@googlemail.com>, jbrunet@baylibre.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" <linux-amlogic-bounces@lists.infradead.org> Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index b750c837ec39..0d9faf1a51ea 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -184,7 +184,7 @@ gpio_intc: interrupt-controller@9880 { compatible = "amlogic,meson-gpio-intc"; - reg = <0xc1109880 0x10>; + reg = <0x9880 0x10>; interrupt-controller; #interrupt-cells = <2>; amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
commit 200a575b68d2 ("ARM: dts: meson: organize devices in their corresponding busses") organized all peripherals in busses so that the base register offset of the bus doesn't have to be included in all child-nodes anymore. The GPIO interrupt controller however specifies the register offset without subtracting the "cbus" base address. This leads to a problem where of_iomap inside the irq-meson-gpio driver fails because it actually tries to map 0x182209880 (cbus base = 0xc1100000 + 0xc1109880 for the GPIO interrupt controller). Fix this by using 0x9880 as register offset. Fixes: 7d32bc03bcfb ("ARM: dts: meson8b: enable gpio interrupt controller") Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- arch/arm/boot/dts/meson.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)