From patchwork Thu Sep 28 07:51:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 9975531 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 D3DC9603F2 for ; Thu, 28 Sep 2017 08:49:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3ECB27FAE for ; Thu, 28 Sep 2017 08:49:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8B5C2838F; Thu, 28 Sep 2017 08:49:22 +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 41AAF27FAE for ; Thu, 28 Sep 2017 08:49:22 +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=yydCHqc5GgwdPEl6BrnTC3Y51qWp7eI1AhmSh8Lm1rk=; b=Sqr0461iZWLkk1bXXvZrIzHEqP zrOqhZf2CYuUxYValIcdTATuDqlvidfupeE/Kv/4vmyk9mpeP/JVPeBIaYfvpddsofMHLaoQ0INg0 HJyI9SbLfcaR5oJ13/JynG8d/txSUdr6wu/jEE0nQGXkwRHwsRWO0vVoUDefuQEsoZ1pGqrv6O2KF tu3tbYzU0Te2DwrkiFi5aP4imRbdJ6PkIe61kg2HDi5IAjU+CDU4Di02rdnGtZIe2nVmnfMmkNHBl E5mBEzK0jUMGWOscy3THK8MYgHcjWNDQuLXKoNG8ppkSFo+0DwVlM3mFtuyDf6KIn+vcJwXwBkEqQ bXNS79CQ==; 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 1dxUVQ-0002zx-4I; Thu, 28 Sep 2017 08:49:16 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dxUVN-0002td-BP for linux-arm-kernel@bombadil.infradead.org; Thu, 28 Sep 2017 08:49:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=W3AE2lB8EA8cIV5mU2Dh96HRVxUH10d0tBsHDiMaIcc=; b=mnYDLhWwFVwxvn86NWmKrJhBy 7PzInrdUOkNPQIzYuElJHuLiBMkRwurXw36gkS2/4Ej7wgmR4Nkzfi+4dgaBn2Zn92XKz4Hn6smy5 Z9MDOCBKRNQIx4tSzTcTPL8dB1R8VkY/mz12ToDaJnngJoIv2tOTpC9vofzZK44lyxByGeC3I9MxX 9KU9/YFaTOEy9SQ+/sTLIT+fp9j6XEuC/lqsPpkTlpxvPsuP5dYvRXfLZIvys53ct/IdSYUHRK3o1 59z1HTa/SQrK0b5BbV2dnwK3+8TU3+hQ62gNFy5zrocijhce56pBqNYy3jrYE4uS2fwYqhbo16Dlq /Lomh2T4g==; Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dxTdk-0007zY-Aq for linux-arm-kernel@lists.infradead.org; Thu, 28 Sep 2017 07:53:49 +0000 Received: by mail-pg0-x242.google.com with SMTP id j16so1068951pga.2 for ; Thu, 28 Sep 2017 00:53:27 -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=W3AE2lB8EA8cIV5mU2Dh96HRVxUH10d0tBsHDiMaIcc=; b=t6wRnR7TlKv5cqqBd2P+OCBBgG52vbzaRtZdqhnbrgiuQVXRRjsryf7CZA45ZG5OBD k0lOelN4Dof2bgSvmhRu0++J7sdPGClePZ4ZLa4QjOYayvOWcngdqao0Uuj7BXsW0J2D x9d47jLJ/x7A4fMHe1Y3iUbPiQDk8q5S+/YldyQI6BiYgBM0ViD+GHjdY/JqUQqmJOMy wEPFKnTwgtO/7A0RyNG0pdTOkZNafr0V2JZTYWKT2EisUHJ6XZmZIeLF3YOXJ6fCmaGD LVlh+ONXov+CDEySdtLDfg7IXZZmBpYsglUC7BJDNe9tub2BsZih/r0uvJ+yNBP4BBjL sX2g== 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=W3AE2lB8EA8cIV5mU2Dh96HRVxUH10d0tBsHDiMaIcc=; b=fnfj6HcpN4ZyHKA3kWb+soj7mwv8XLggqCfnzyhD3TYnaXvMnXvZu0OfS0MU+XkzsA Yhhg7JvaDyCpoOv/nBkettEhoWraZFnR7MAfjR0jojXONG100JjMkd1i1u8l5NGJOtWL sq1zRvo2hPX1+P4rpQiQFYRLQ0DIyeUoHGji+8sCiFQAsOt3jgXU22aPz4Z6NVWIEKGv 8vNhlDBQmOtN1CyXpmg2bGKfbXpUIE4+YWf6PbvxpZ6yfxmMpLyJoyjaLiqX1fwEr1Qe T+88aK9fNLK7ZqMLxRmc2JNdPfjz9L+OwBJI5JfCkYrUWkTGIxAweBqGpVN64xLT4OT1 tqKA== X-Gm-Message-State: AHPjjUgxKfB0elTcFpmLwGefGyQaY3BUaVuG6mEkgQWbN7LmBkoPR7g+ MSo59ECF/GmWNc5HxOWTEAE= X-Google-Smtp-Source: AOwi7QAeu4vFLSmT3/0ecZKzjy97BbvW3jtE8HyAHsEjhvC+LbGWJfl+1O4kt5OaBTtYxtuXmPPR5A== X-Received: by 10.99.181.23 with SMTP id y23mr3455510pge.165.1506585205428; Thu, 28 Sep 2017 00:53:25 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id e2sm1801390pfc.176.2017.09.28.00.53.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Sep 2017 00:53:23 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Thu, 28 Sep 2017 17:23:16 +0930 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH 8/8] ARM: dts: aspeed: Clean up UART nodes Date: Thu, 28 Sep 2017 17:21:49 +0930 Message-Id: <20170928075149.8154-9-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170928075149.8154-1-joel@jms.id.au> References: <20170928075149.8154-1-joel@jms.id.au> 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 - Move stray uart1 in g5 definition - Remove outdated current-speed property. Different bootloaders use different speeds, so this is no longer helpful Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 17 +++++++++-------- arch/arm/boot/dts/aspeed-g5.dtsi | 36 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 191c33d18122..7a4a53666d70 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 { @@ -199,7 +200,7 @@ uart1: serial@1e783000 { compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; + reg = <0x1e783000 0x20>; reg-shift = <2>; interrupts = <9>; clocks = <&clk_uart>; @@ -209,7 +210,7 @@ uart2: serial@1e78d000 { compatible = "ns16550a"; - reg = <0x1e78d000 0x1000>; + reg = <0x1e78d000 0x20>; reg-shift = <2>; interrupts = <32>; clocks = <&clk_uart>; @@ -219,7 +220,7 @@ uart3: serial@1e78e000 { compatible = "ns16550a"; - reg = <0x1e78e000 0x1000>; + reg = <0x1e78e000 0x20>; reg-shift = <2>; interrupts = <33>; clocks = <&clk_uart>; @@ -229,7 +230,7 @@ uart4: serial@1e78f000 { compatible = "ns16550a"; - reg = <0x1e78f000 0x1000>; + reg = <0x1e78f000 0x20>; reg-shift = <2>; interrupts = <34>; clocks = <&clk_uart>; @@ -239,7 +240,7 @@ uart5: serial@1e784000 { compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; + reg = <0x1e784000 0x20>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; @@ -248,9 +249,9 @@ status = "disabled"; }; - uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; + vuart: vuart@1e787000 { + compatible = "aspeed,ast2400-vuart"; + reg = <0x1e787000 0x40>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 251fc9f4637e..0b793305120a 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 { @@ -247,16 +248,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,9 +278,19 @@ }; }; + uart1: serial@1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x20>; + reg-shift = <2>; + interrupts = <9>; + clocks = <&clk_uart>; + no-loopback-test; + status = "disabled"; + }; + uart2: serial@1e78d000 { compatible = "ns16550a"; - reg = <0x1e78d000 0x1000>; + reg = <0x1e78d000 0x20>; reg-shift = <2>; interrupts = <32>; clocks = <&clk_uart>; @@ -299,7 +300,7 @@ uart3: serial@1e78e000 { compatible = "ns16550a"; - reg = <0x1e78e000 0x1000>; + reg = <0x1e78e000 0x20>; reg-shift = <2>; interrupts = <33>; clocks = <&clk_uart>; @@ -309,7 +310,7 @@ uart4: serial@1e78f000 { compatible = "ns16550a"; - reg = <0x1e78f000 0x1000>; + reg = <0x1e78f000 0x20>; reg-shift = <2>; interrupts = <34>; clocks = <&clk_uart>; @@ -319,18 +320,17 @@ 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"; }; - 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>;