From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752438AbdI1HxT (ORCPT ); Thu, 28 Sep 2017 03:53:19 -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 X-Google-Smtp-Source: AOwi7QDiRQ2Jwl4+OM80JhuECe/oZu8LKI0dCMZazdhxljzxVp6hFQGW3gP1ATE9o+CVdD/l+oKfnA== 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=20Le=20Goater?= , 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 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(-) 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 { -- 2.14.1