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: 819438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y2n4J1kBhz9t66 for ; Thu, 28 Sep 2017 17:53:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wtcma9pe"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3y2n4H6rl0zDsPp for ; Thu, 28 Sep 2017 17:53:19 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wtcma9pe"; dkim-atps=neutral X-Original-To: linux-aspeed@lists.ozlabs.org Delivered-To: linux-aspeed@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::241; helo=mail-pg0-x241.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wtcma9pe"; dkim-atps=neutral Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3y2n4F1fRyzDsPp for ; Thu, 28 Sep 2017 17:53:17 +1000 (AEST) Received: by mail-pg0-x241.google.com with SMTP id d8so1067031pgt.3 for ; Thu, 28 Sep 2017 00:53:17 -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=FlGxaJc+DU0+UGN1FvTQuuWR1eAHE7a/OOe8tLoU26nOrLdeQ5xCKtvyp6yKZAf938 FFhdv7wF4v3rG04+L8+DPDId0E86k7/3NwRUHaeusp6RbcXQ/ZzahIvrOK8BLJWMaVKr BQJW1Ft9OHLsNbHLVQ8mg8Dg8MPyvVv1nnG6IqSYbQcaIJuZ/ss7wc09FH214Uq6yZUK g+laZJiqcB3pykOmK+yKYh8nKnEXKfu7GL8QQUHUx/ruXgX9HCRl7c9LeGuzJHC6ab+w cRclphZog78g+Vff3z/sk2SnMsdQjOlC2j7UcUixrKVhYgS7Ka2+BWjXWn67/Q7wrR15 Am1A== X-Gm-Message-State: AHPjjUh+dxsb6dEPmJazdz+rX8nWi+TKluJOrNuCh5yemVK44akhtiNl JcFpykJv9hLh53RJJLDDTVg= 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 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> X-BeenThere: linux-aspeed@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux ASPEED SoC development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Brendan Higgins , Russell King , linux-kernel@vger.kernel.org, Rick Altherr , linux-arm-kernel@lists.infradead.org Errors-To: linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linux-aspeed" 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 Reviewed-by: Andrew Jeffery --- 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 {