From patchwork Wed Oct 4 06:49:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 9983947 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 AB7E360365 for ; Wed, 4 Oct 2017 06:54:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DC4628A2A for ; Wed, 4 Oct 2017 06:54:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92A1328A81; Wed, 4 Oct 2017 06:54:42 +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_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable 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 0378128A2A for ; Wed, 4 Oct 2017 06:54:42 +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=mHuUfmRI/eXxBJmNQ97CQA5RaFZKLZgvQOeuS/Y+tbM=; b=WXqwu3Y62Doy+mmgs9FZauZ+jn dKbdmomXw3hIE3NROgDEpwyNC7pi6Nok7lyfiqrdHRJLkSs3/tDpq34qcAfgDZ4N4i8uAp3haC/q/ NHRx8tpaXGd7uMcAg+mK34CVjrpmE6oXwLq24fl63d5AMzsdRb7yrCsV4JsXF1spJ6czJpolSHeKE UO+qNSXcqPkzoichUf0EsahVow1IwD1JnlPo+CcMcybRUCjf7ppWCjMXlWXYJcA3tMd2nwk1/sUhO qdgllnBxBmqJFOUm4WxsR9SL9ayLCS1XNFS/fdGQZBZfsN+eSkAMVUz6QiV+mNxHnGlVv3+Ih1zIy vyVSUofQ==; 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 1dzdZk-0007mX-Na; Wed, 04 Oct 2017 06:54:36 +0000 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzdWO-000571-2K for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 06:51:14 +0000 Received: by mail-pg0-x244.google.com with SMTP id y192so12405040pgd.5 for ; Tue, 03 Oct 2017 23:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1NXNPKlpniBXBvc3eWHKGT4NjYAtc1t3KblBQ2zZFV0=; b=q++rKb8leEPIsiCRdlNqizuT0FYcIuvAi5Qi+jxFXcwA2II8UqkJMVdY0f7i0EHSnx YkNFJfTLyTpLDyG8vVcW4SZv7MWe76Di3WO4w4n0YdG85OcXxxILFllfsQVHuRoGA1n4 lsqKkdGNsK9mmjc1T0/4wPYKLhZFrcY8fKnID3MJHxag/P2y41KR/TMRI3t0sAt0IT/G bvga6hw3rYwf7nuPUWgRnalAxCrko+s4JEjbFj1IagbrI6DBTw8SQYCVLSz2hSMclqHN 3X9nJLPIAIDVdprudrrk27qqIyPkHKCPdGQlPZcMLwUIUHH6dkUCGiUZdRBTagLuee5Q ADWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1NXNPKlpniBXBvc3eWHKGT4NjYAtc1t3KblBQ2zZFV0=; b=CEnlf5eMoU6ia5k1hZ3R0hAvfF3mRtRY+OWunVIESh2h2a/LQZsHqqqP42BToowP9S Yel7MfiHKTnxC4hv3Gh8c8LlzDqOecZy7fRDa2MCIPY+8yxl+iwF4XRPXUl6McEJ/uwx mgBrlhwLTAlZy5uqPZjIXtT7Nmlp/aDoaVRvPdehmqUud8qTvlDJNG4zA2YZhPuGFQaa t9Q2HJEVOaTCaBDMyssQ49sQ1NV7skh9PgOsFAiDcteCJXzSEP6mckv+CzrNbazNuDZQ ltbhv0SP4E8FHpoUxuhzFfOYgNYPbo8RotE1H++PEDh6nUZZk61eQaDyNF9OFMf72yMS VGtg== X-Gm-Message-State: AHPjjUiUKHLS/PY7ywaWz/zBrMEMJHJ+TmiRxQhYltza8h2xuVS91itk gwwb0Dhg3FKm8o7LdlQHRoL/RWYCNoY= X-Google-Smtp-Source: AOwi7QD5S9d+w7l2EPJ1ZZsV99Lbsa8v4eAThLDovmuiZSKvD51JcsVfG9PppW2wZY60icr8SdAlAg== X-Received: by 10.84.129.65 with SMTP id 59mr18930511plb.442.1507099847292; Tue, 03 Oct 2017 23:50:47 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id t19sm24567700pfa.73.2017.10.03.23.50.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 23:50:45 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 04 Oct 2017 17:20:38 +1030 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes Date: Wed, 4 Oct 2017 17:19:16 +1030 Message-Id: <20171004064917.2498-9-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171004064917.2498-1-joel@jms.id.au> References: <20171004064917.2498-1-joel@jms.id.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171003_235108_489478_9079C263 X-CRM114-Status: GOOD ( 10.17 ) 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: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery , Brendan Higgins , Russell King , linux-kernel@vger.kernel.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Rick Altherr , linux-arm-kernel@lists.infradead.org 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 Order them all by address. Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------- arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 55 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index a549413bda3f..4125e07f22f9 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -183,6 +183,27 @@ clock-names = "PCLK"; }; + uart1: serial@1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x1000>; + reg-shift = <2>; + interrupts = <9>; + clocks = <&clk_uart>; + no-loopback-test; + status = "disabled"; + }; + + uart5: serial@1e784000 { + compatible = "ns16550a"; + reg = <0x1e784000 0x1000>; + reg-shift = <2>; + interrupts = <10>; + clocks = <&clk_uart>; + current-speed = <38400>; + no-loopback-test; + status = "disabled"; + }; + wdt1: wdt@1e785000 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785000 0x1c>; @@ -197,11 +218,11 @@ status = "disabled"; }; - uart1: serial@1e783000 { + uart6: serial@1e787000 { compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; + reg = <0x1e787000 0x1000>; reg-shift = <2>; - interrupts = <9>; + interrupts = <10>; clocks = <&clk_uart>; no-loopback-test; status = "disabled"; @@ -237,27 +258,6 @@ status = "disabled"; }; - uart5: serial@1e784000 { - compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; - reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; - current-speed = <38400>; - no-loopback-test; - status = "disabled"; - }; - - uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; - reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; - no-loopback-test; - status = "disabled"; - }; - i2c: i2c@1e78a000 { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index de2dafa71651..61cc2d25143a 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -227,6 +227,26 @@ clock-names = "PCLK"; }; + uart1: serial@1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x1000>; + reg-shift = <2>; + interrupts = <9>; + clocks = <&clk_uart>; + no-loopback-test; + status = "disabled"; + }; + + uart5: serial@1e784000 { + compatible = "ns16550a"; + reg = <0x1e784000 0x1000>; + reg-shift = <2>; + interrupts = <10>; + clocks = <&clk_uart>; + current-speed = <38400>; + no-loopback-test; + status = "disabled"; + }; wdt1: wdt@1e785000 { compatible = "aspeed,ast2500-wdt"; @@ -247,16 +267,6 @@ status = "disabled"; }; - uart1: serial@1e783000 { - compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; - reg-shift = <2>; - interrupts = <9>; - clocks = <&clk_uart>; - no-loopback-test; - status = "disabled"; - }; - lpc: lpc@1e789000 { compatible = "aspeed,ast2500-lpc", "simple-mfd"; reg = <0x1e789000 0x1000>; @@ -287,6 +297,16 @@ }; }; + uart6: serial@1e787000 { + compatible = "ns16550a"; + reg = <0x1e787000 0x1000>; + reg-shift = <2>; + interrupts = <10>; + clocks = <&clk_uart>; + no-loopback-test; + status = "disabled"; + }; + uart2: serial@1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x1000>; @@ -317,27 +337,6 @@ status = "disabled"; }; - uart5: serial@1e784000 { - compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; - reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; - current-speed = <38400>; - no-loopback-test; - status = "disabled"; - }; - - uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; - reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; - no-loopback-test; - status = "disabled"; - }; - i2c: i2c@1e78a000 { compatible = "simple-bus"; #address-cells = <1>;