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: 114752 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp5636667edb; Tue, 3 Oct 2017 23:51:01 -0700 (PDT) X-Received: by 10.98.166.136 with SMTP id r8mr19603615pfl.228.1507099860888; Tue, 03 Oct 2017 23:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507099860; cv=none; d=google.com; s=arc-20160816; b=p0b0VqFbXpIfJkz664mk6qJT8V8aDQ0um4wQx1Z7xnUYL6EBaFx4bsw24AuhrXpMPU qu9N1QvAyaUv7tGTE+Qic9eedjM51C4sqcEM3GjDV4UpzNMUGZbPtqykP/QAi7xwN4xv nTav4mzC/iqGu6DXBMyn50IYO5tOQQWFp7qZKTmFiJ0RN4VWj//+qGirg5pP8FkB30ZI LgoYCVo9kp0OnfEPQfA3FsUZAcTG60WZs88qYrEevwS4MTL6CRVBRHjhkvb2m4TXWzLw XflIIIcrySsPL92O5X3L2+D4lpS6W6x8b3hTDHNPx64ayjX3yMZZ8v/yhpuRChyeMwPD 2hZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=69K2Z/GAxCg6LxZ3T2lJjaJU4UQ0yrniyWN9XbUUz2Y=; b=L2GoP3jUGhEOtkzqfGarOQTghITRc/WHc8FDREhoTCp61UDO5cpdJ/VFBrt3i7WQBD oripFyHgfxW1KeYqUT1XEEfWaP450J7z+DHclTkeE+h4kt4+jzkgrmW56qijAYSRT9Ns qmwwxNKkIb76Dti5MvNgPWoQ23iP4RZ7a/siinP36zscAjTmhFlDRtOTlqxnw30LfdB/ rjKVk2RMHXSkNpBP/FkHp+5z2F9VFTuh4pmL7QcyrcCgeCbQoeH9tgXamTpnBDkMYcgv kfrNgGzoRkfGqa1dlTs+5v6ytZ9ucNr0kIzwR4W+psfKsY/xDkPWLLQrLETFbc2kev2m +apQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Ube2t96c; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10si802621pgu.297.2017.10.03.23.51.00; Tue, 03 Oct 2017 23:51:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Ube2t96c; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751906AbdJDGu7 (ORCPT + 26 others); Wed, 4 Oct 2017 02:50:59 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34735 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751234AbdJDGu5 (ORCPT ); Wed, 4 Oct 2017 02:50:57 -0400 Received: by mail-pf0-f193.google.com with SMTP id g65so11543485pfe.1; 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=fmRf0DyOWp4VeVe8hffgmxCHMM9tJ4H4P4iF6douwx5o3lDOpzztDWrdOFSpDc4+RU p/dh3lWmqHgW6XI2CGj3gzJ/TW/CQK/JrcbqAPFz7ywtJlncrkCEIw0tlY7enpyRfMQG R/LNxwbdpC8dsgKXoxHErrbuRGtz2yvdpmWlOOkWsvYKLC93DNT0sWP21qraJrNI89F/ gPcqApIa3fKUEjkJXax1sbqs/l7WTCPFJn64KmCuwGm3s4149hCBuwZm+5Z/moI8i6Y1 tFb2zXTTEAk96OZ2XmBEA03gjTaHlrblmhh5Qz0hfhZZ5E3Y4bj+mYtZFowI7zkwcUna Yaeg== X-Gm-Message-State: AMCzsaUOJKGPvDrTPFtdg+1xJtOa3ulP0F7OAjjjLeMIeYjvv28PKZSw RWDfgqTIhQdDngsPcwOhnKY= 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 Cc: Russell King , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Jeffery , Rick Altherr , Brendan Higgins , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , linux-aspeed@lists.ozlabs.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - 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 --- 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(-) -- 2.14.1 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>;