From patchwork Thu Oct 1 10:52:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 7307501 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D7FBFBEEA4 for ; Thu, 1 Oct 2015 10:54:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07C3120798 for ; Thu, 1 Oct 2015 10:54:54 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 2C46720644 for ; Thu, 1 Oct 2015 10:54:52 +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 1ZhbUJ-0007Wn-3t; Thu, 01 Oct 2015 10:53:23 +0000 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZhbUF-0007NP-5x for linux-arm-kernel@lists.infradead.org; Thu, 01 Oct 2015 10:53:20 +0000 Received: by wicfx3 with SMTP id fx3so22415045wic.0 for ; Thu, 01 Oct 2015 03:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=k601AXQvwYpx40I8pAfyATQKpsBlLejGJMo71jfhTkg=; b=Yb4+QwEZUUAa85jYKFBFABIDHeITWIIi8hbTrR4gz4vlrflUVoWRljiNr6jIUirx4v jfoekeMNbMcWimO2gdY/ybwCHeDCz39XsGbtcS8zMMEwquLnZd+fcLM4Vlc00liEwM6V c7vUUiAu2obPuWWoc1vyTk2qkaVzv9CrtVGnqqinIMUFn70yh+APOPMAcgmso0e2cBlm IeedLb7E7EDvu3AEnWvoV/hrU//6sV1eeSIf/J9Tklkqmd9GCXhGLf9Ap1Y0+RXgIpZc n/jD24t6HMfZBEqAznioYXma1XBt5XDQ4roNn/9/OPbSD/lyjbPCT91zP26Ya3TW4nvt rKpw== X-Received: by 10.194.90.20 with SMTP id bs20mr10948198wjb.87.1443696777212; Thu, 01 Oct 2015 03:52:57 -0700 (PDT) Received: from nuc.endlessm-sf.com ([212.91.95.170]) by smtp.gmail.com with ESMTPSA id t7sm2558480wib.1.2015.10.01.03.52.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 03:52:56 -0700 (PDT) From: Carlo Caione To: john@feith.com, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, drake@endlessm.com, jerry.cao@amlogic.com, victor.wan@amlogic.com Subject: [PATCH] ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers Date: Thu, 1 Oct 2015 12:52:40 +0200 Message-Id: <1443696760-8316-1-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151001_035319_412702_74A374F5 X-CRM114-Status: GOOD ( 10.06 ) X-Spam-Score: -2.4 (--) 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: Carlo Caione 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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 From: Carlo Caione The DTS erronously uses the wrong reg mapping and IRQ numbers for some UART, WDT and timer nodes. Fix this. Reported-by: John Wehle Signed-off-by: Carlo Caione --- arch/arm/boot/dts/meson.dtsi | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 5484413..8c77c87 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -67,7 +67,7 @@ timer@c1109940 { compatible = "amlogic,meson6-timer"; - reg = <0xc1109940 0x14>; + reg = <0xc1109940 0x18>; interrupts = <0 10 1>; }; @@ -80,36 +80,37 @@ wdt: watchdog@c1109900 { compatible = "amlogic,meson6-wdt"; reg = <0xc1109900 0x8>; + interrupts = <0 0 1>; }; uart_AO: serial@c81004c0 { compatible = "amlogic,meson-uart"; - reg = <0xc81004c0 0x14>; + reg = <0xc81004c0 0x18>; interrupts = <0 90 1>; clocks = <&clk81>; status = "disabled"; }; - uart_A: serial@c81084c0 { + uart_A: serial@c11084c0 { compatible = "amlogic,meson-uart"; - reg = <0xc81084c0 0x14>; - interrupts = <0 90 1>; + reg = <0xc11084c0 0x18>; + interrupts = <0 26 1>; clocks = <&clk81>; status = "disabled"; }; - uart_B: serial@c81084dc { + uart_B: serial@c11084dc { compatible = "amlogic,meson-uart"; - reg = <0xc81084dc 0x14>; - interrupts = <0 90 1>; + reg = <0xc11084dc 0x18>; + interrupts = <0 75 1>; clocks = <&clk81>; status = "disabled"; }; - uart_C: serial@c8108700 { + uart_C: serial@c1108700 { compatible = "amlogic,meson-uart"; - reg = <0xc8108700 0x14>; - interrupts = <0 90 1>; + reg = <0xc1108700 0x18>; + interrupts = <0 93 1>; clocks = <&clk81>; status = "disabled"; };