From patchwork Thu Sep 28 07:51:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 114400 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp435057qgf; Thu, 28 Sep 2017 00:53:21 -0700 (PDT) X-Received: by 10.84.252.130 with SMTP id y2mr3295656pll.68.1506585201701; Thu, 28 Sep 2017 00:53:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506585201; cv=none; d=google.com; s=arc-20160816; b=hEisiZ40wmLPTe8ZfVlH+STKzruXWJp210LZyKm0hXc4gQoaF4uUSkulabbw31/vE/ gw1JRhgEylWJVY2d3kaq0fKUJ26CLkkH8gDoTjJL5n+uKoEUujmZnYj+E6yQmQD4ZiKm wE14+rXWt4gWxVDwg4Tw0+WIfMxg71kOkXpA8x56xd7bcGUc8MgGmPbGyHu26jIB8S/M TT/H/yw9nvyIAgz2+pkEYaMqVNMTc15dsDH3YSTQRr6roiKybaEgBJY8LX4VSgpUPUSA Lmkm7OQd4d2j6Zhwexs7TdTdpEbiryhWXBzSnLEJWsODiAp0/nF72AZzoujGaeX1TFFR p9rA== 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=Bcc/5hW9J7QPxogHNuLBU0LXGrcfs25wCZGiiDhA0uE=; b=kRX60MS9gswHLDey5SCXDaIyp5DN6+SQ7U5xYwhfQvXcdaP5BxDDI2o7sCFqa9okWK gfx6lFOSl11s70oiiyZmcEAR5kiJPZ3IDeQwMrLtELVPQbCZjTkHGNOg7A2AccP15s+Q DZwyD8qmB4q9UQJaF5k2L11oVceb0GsqC8NNPW4cVClempHK9z1tasr4BlyUxjymFJc/ 0P758AluL26ESGScoLz2v+b9aPDzy182VN0zE49udKy01+xMHhVhyOjtF8YFqIjRJ+7X HFZTIMEF5EHDifltxjRAdWTaySPiFlxwBrNcI6mMVrmBECTwNxBuNVkSvjnIlciFyYoj 6pNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Wtcma9pe; 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 102si937878plf.356.2017.09.28.00.53.21; Thu, 28 Sep 2017 00:53:21 -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=Wtcma9pe; 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 S1752442AbdI1HxU (ORCPT + 26 others); Thu, 28 Sep 2017 03:53:20 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36886 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752359AbdI1HxQ (ORCPT ); Thu, 28 Sep 2017 03:53:16 -0400 Received: by mail-pg0-f68.google.com with SMTP id 125so759398pgj.4; Thu, 28 Sep 2017 00:53:15 -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=Bcc/5hW9J7QPxogHNuLBU0LXGrcfs25wCZGiiDhA0uE=; b=Wtcma9peNIr7enmOZnXZBj4UGJK2phqljlvtMyqViydhsrxswdYuph/R3iiNUY8oa6 y1g6ud7sBIDbFMd751yWk3OoDGEoVaCDd3fXDgu84QVYswV0YhnFnOYECqn7dtfGAVeS CKOpSB83n8bTS8GQ7Yp8i9wpMbU19s7cm9u0at9NyXEWHVMFZ8t6+PcVbUCvJan6b5kG pZ9idLH8aKQaAamoXo3ssyp+rymm75gGDq4PkQ8+xNXX0WKGVl86V7QNxqBxxLSAtFMi 5hqhMsaWl/1uqvDUL3mSm6/s3F489BEqj734cpsX0k9uQ6x3HhUxBZYliR9iG1OCzGci eTsA== 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=Bcc/5hW9J7QPxogHNuLBU0LXGrcfs25wCZGiiDhA0uE=; b=Uh5m5cqWj8WqRHyV1+hMwsmL1PRQMy1qleRAJv4Ii66E6ZGUoeZimbY308WKo9geax wxiwLoWE2+/+Ph/KL+1I/0hOW2twaEqM1cJkWCkbHvEH0RjgW+l6gPWtSw+2S/knOmqI r4dv3ncGlXWO+ed0cHE8fsX1uTrsYsw4QIugP3HbD/NPQBFbPsc9Ub86JWJHhsgQ/xT8 PQKm5er8aQMbUlpsJzevwHT5jRVM9G7tk5Z5iiqNXrfO2+yGr0BHKvrHk7HQ5AfT4XIC YRmKYF4VFCF6Ngo9ti+dGcCFTFLr0iBfHfG081Sm4KYq0y2fuDuPeQ4zBLT7vLlE1y/2 chmg== X-Gm-Message-State: AHPjjUhMX0NUmaWOkC6By1iMFVocwiw0QBBdsRLTnEV+JejITGpjiH48 rKWYlX/ccriIsa3OW2kHUBvNHGZhb9c= X-Google-Smtp-Source: AOwi7QDiRQ2Jwl4+OM80JhuECe/oZu8LKI0dCMZazdhxljzxVp6hFQGW3gP1ATE9o+CVdD/l+oKfnA== X-Received: by 10.159.253.67 with SMTP id b3mr3445414plx.237.1506585195543; Thu, 28 Sep 2017 00:53:15 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id t8sm1586841pfh.116.2017.09.28.00.53.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Sep 2017 00:53:13 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Thu, 28 Sep 2017 17:23:06 +0930 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 7/8] ARM: dts: aspeed: Add aliases for UARTs Date: Thu, 28 Sep 2017 17:21:48 +0930 Message-Id: <20170928075149.8154-8-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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Existing userspace expects the console (UART5) to be at /dev/ttyS4. To ensure the UARTs show up where users expect them, we give them fixed aliases starting at 0. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 ---- arch/arm/boot/dts/aspeed-g4.dtsi | 5 +++++ arch/arm/boot/dts/aspeed-g5.dtsi | 5 +++++ 3 files changed, 10 insertions(+), 4 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index e387c80b7f4f..be51be5a5f39 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -6,10 +6,6 @@ model = "Palmetto BMC"; compatible = "tyan,palmetto-bmc", "aspeed,ast2400"; - aliases { - serial4 = &uart5; - }; - chosen { stdout-path = &uart5; bootargs = "console=ttyS4,115200 earlyprintk"; diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index f8611d5a6465..191c33d18122 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -22,6 +22,11 @@ i2c11 = &i2c11; i2c12 = &i2c12; i2c13 = &i2c13; + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; }; cpus { diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index de127370131d..251fc9f4637e 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -22,6 +22,11 @@ i2c11 = &i2c11; i2c12 = &i2c12; i2c13 = &i2c13; + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; }; cpus {