From patchwork Wed Oct 4 06:49:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 9983949 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 1E87560365 for ; Wed, 4 Oct 2017 06:55:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1126E28A3E for ; Wed, 4 Oct 2017 06:55:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05E3628A83; Wed, 4 Oct 2017 06:55:07 +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 86B3C28A3E for ; Wed, 4 Oct 2017 06:55:06 +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=GNRi6ZV08HhjyXCPWR/y2DqSEejycVAPo57B8K6BquU=; b=lnLtzvUQGVSmSCEaQz//lxuG51 0dB5AwbZ2MV43MVDkrAbvQE/DdkLxIz8lq0ciIJ9w9K2s5m9/m2eYPNo6HZWSPO3GMZ8lxD1cs7xu 9blCZC1ACc2VuLRBKKRc3gYab3y6fLlZ0iW3mspSZ0sABb52uBc2xL+v/otRbRULayMH5Com/eFjW P4OYxpcq9e/eNmnAcOjJ3yHxlKhd8vfluDhlEf/GQl4mFGpyKSloCea4mjsluSGH8zZdBToP5GcyS zdk+u2VwxxQXBzxgfww1cHnuTLiDqztf8OlBmD66PohaxByyS5/3R8uk0elr2BmZqYyMJjq6XtKjj jUyGaMgg==; 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 1dzda9-00086U-5g; Wed, 04 Oct 2017 06:55:01 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzdWX-00059i-5b for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 06:51:23 +0000 Received: by mail-pf0-x242.google.com with SMTP id m28so11406586pfi.0 for ; Tue, 03 Oct 2017 23:50:57 -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=69K2Z/GAxCg6LxZ3T2lJjaJU4UQ0yrniyWN9XbUUz2Y=; b=Ube2t96cpPjp9ougyOoPD3U0fJoIvQ/a5lW+kRXElMqTkmi8XVlaaRftNpQ1f/suDU n71Wmoj1FucW86ZjOT9YOTDAMoeCQgRn3wn0TRkGWqioB6iqk4tzB7tNRZGSyyV/8A7c iyNvmsOeWbitXgQ6pjp6M8rQ3LFDN8GGoeKa9AcmtGSFqZjuchkJJntoXpMa5vbBKZpr YqtJRgUjJTddxU7js0sWfeS3qsElnzz6Ve2aTnVVv3mwE1pOeqxBEb1hTe2NnXjuYTL+ Se/tQlFPmM8SgrjWRhiZDulp5qrM5KH6J0vB4+QXt5KXn+8DMlWpD3//liw461l3J4N9 49rA== 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=69K2Z/GAxCg6LxZ3T2lJjaJU4UQ0yrniyWN9XbUUz2Y=; b=NizYe++28g2sUC9BUhKh8ilGM5OSxv3i+LRQSELPhNW1NShqpeiOwnJ1x7tt6S8TJO 3ZHDqTbzAuq5m8XwZw45Dukh2ZEyGuW8hgNzmvT9+4ng2whPRxzETrGQvWBj/H4VkIkL F0xeHw5pVjlDKtkhM95rhIqsiO3pcrIIUJd9D53WzOH4YCjMDCuZ3yzK0yfncwjKA9he l0NGbVKQCPTO2KyEGS7ypVono1zTU/vOJZSCJMVXiFhdbtsycwCy0+2SsK/U4WYa1IGW /X4sfPQr1WTfiWjLTuHPqND2uSHn+WATATVZONFoS2slR/62whX6yVmEUSXRStBuKgt/ ECdA== X-Gm-Message-State: AMCzsaV9PH/hWZU+LLZxu4diFXz2G/fuwSgtd4+mSIwFLObgpdQgwJ+S j5+P5vzCxgHRHLCwlU2ybk4= X-Google-Smtp-Source: AOwi7QBIdnid97QDOWGCuJOEWcJVK4zh+X148yVStjNv8ONm+LM0LBcUuCcpkyEiADa3UyhhRMS70g== X-Received: by 10.99.160.86 with SMTP id u22mr9972216pgn.283.1507099856661; Tue, 03 Oct 2017 23:50:56 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id h10sm26304759pgn.73.2017.10.03.23.50.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 23:50:55 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 04 Oct 2017 17:20:47 +1030 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH v2 9/9] ARM: dts: aspeed: Clean up UART nodes Date: Wed, 4 Oct 2017 17:19:17 +1030 Message-Id: <20171004064917.2498-10-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_235117_752704_9993754C X-CRM114-Status: GOOD ( 11.23 ) 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 - Shorten size of reg property so it covers only the implemented registers - Add VUART compatible, and change node name to serial@ - Remove outdated current-speed property. Different bootloaders use different speeds, so this is no longer helpful Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery --- v2: - move node reordering to seperate patch - fix vuart node name - actually remove current-speed from g4 --- arch/arm/boot/dts/aspeed-g4.dtsi | 18 +++++++++--------- arch/arm/boot/dts/aspeed-g5.dtsi | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 4125e07f22f9..e455bd236798 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -27,6 +27,7 @@ serial2 = &uart3; serial3 = &uart4; serial4 = &uart5; + serial5 = &vuart; }; cpus { @@ -185,7 +186,7 @@ uart1: serial@1e783000 { compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; + reg = <0x1e783000 0x20>; reg-shift = <2>; interrupts = <9>; clocks = <&clk_uart>; @@ -195,11 +196,10 @@ uart5: serial@1e784000 { compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; + reg = <0x1e784000 0x20>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; - current-speed = <38400>; no-loopback-test; status = "disabled"; }; @@ -218,9 +218,9 @@ status = "disabled"; }; - uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; + vuart: serial@1e787000 { + compatible = "aspeed,ast2400-vuart"; + reg = <0x1e787000 0x40>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; @@ -230,7 +230,7 @@ uart2: serial@1e78d000 { compatible = "ns16550a"; - reg = <0x1e78d000 0x1000>; + reg = <0x1e78d000 0x20>; reg-shift = <2>; interrupts = <32>; clocks = <&clk_uart>; @@ -240,7 +240,7 @@ uart3: serial@1e78e000 { compatible = "ns16550a"; - reg = <0x1e78e000 0x1000>; + reg = <0x1e78e000 0x20>; reg-shift = <2>; interrupts = <33>; clocks = <&clk_uart>; @@ -250,7 +250,7 @@ uart4: serial@1e78f000 { compatible = "ns16550a"; - reg = <0x1e78f000 0x1000>; + reg = <0x1e78f000 0x20>; reg-shift = <2>; interrupts = <34>; clocks = <&clk_uart>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 61cc2d25143a..cef51dcc1002 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -27,6 +27,7 @@ serial2 = &uart3; serial3 = &uart4; serial4 = &uart5; + serial5 = &vuart; }; cpus { @@ -229,7 +230,7 @@ uart1: serial@1e783000 { compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; + reg = <0x1e783000 0x20>; reg-shift = <2>; interrupts = <9>; clocks = <&clk_uart>; @@ -239,11 +240,10 @@ uart5: serial@1e784000 { compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; + reg = <0x1e784000 0x20>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; - current-speed = <38400>; no-loopback-test; status = "disabled"; }; @@ -297,9 +297,9 @@ }; }; - uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; + vuart: vuart@1e787000 { + compatible = "aspeed,ast2500-vuart"; + reg = <0x1e787000 0x40>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; @@ -309,7 +309,7 @@ uart2: serial@1e78d000 { compatible = "ns16550a"; - reg = <0x1e78d000 0x1000>; + reg = <0x1e78d000 0x20>; reg-shift = <2>; interrupts = <32>; clocks = <&clk_uart>; @@ -319,7 +319,7 @@ uart3: serial@1e78e000 { compatible = "ns16550a"; - reg = <0x1e78e000 0x1000>; + reg = <0x1e78e000 0x20>; reg-shift = <2>; interrupts = <33>; clocks = <&clk_uart>; @@ -329,7 +329,7 @@ uart4: serial@1e78f000 { compatible = "ns16550a"; - reg = <0x1e78f000 0x1000>; + reg = <0x1e78f000 0x20>; reg-shift = <2>; interrupts = <34>; clocks = <&clk_uart>;