From patchwork Wed Oct 4 06:49:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 821176 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 3y6RPG2hSSz9t2h for ; Wed, 4 Oct 2017 17:50:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IQohDkOb"; 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 3y6RPG0VwVzDqln for ; Wed, 4 Oct 2017 17:50:42 +1100 (AEDT) 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="IQohDkOb"; 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:c00::243; helo=mail-pf0-x243.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="IQohDkOb"; dkim-atps=neutral Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (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 3y6RPC52sQzDqln for ; Wed, 4 Oct 2017 17:50:39 +1100 (AEDT) Received: by mail-pf0-x243.google.com with SMTP id g65so11542819pfe.1 for ; Tue, 03 Oct 2017 23:50:39 -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=UL5BAYDkNYv9P+XJBebD5hm/DvqWd2f3XRTHgOw1koA=; b=IQohDkObYp5A1LfkSY65J6c7L9VUKR3cVj5cjHK9C9/z/j8X5AeJzKB7FjQmGbxMgP MVBwdUgEQdbtkUMnzVMIo3hU+9bB0Q0mZMHu1h/V2yFtw3gFVMrPp0NqeOaKDVbKbcw5 MsXQAwHcMGOnCmIsBwxamlXDBxyJTQlxkf9eKj3RXGbGzlSwXb6XpLru0tl3aitdvzyW VuP3W0gAIOvdsz2H5Ky/HpqrmbyZEQsNFmnoY3mCB5wP1/4LcUYssqEHx/EuDgkfSs7q xhavYpwghih/zslbPLUyoiBdWwjOK1SBbckuoWM2qOejMeRcW/FJfPHSGD7L4LoaVhHU Mkaw== 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=UL5BAYDkNYv9P+XJBebD5hm/DvqWd2f3XRTHgOw1koA=; b=pfyw7Wjvpj+iGKtMAyhfmBgCBuuAX7fXbtUcUVaeNbtm/NLF9MYhdmPL/ikll3cT97 ONR4UPiW0l6HbrzY6buFHPscJviOgk1pmJQIdKxFmgOvRdvWt2u1QpGj3c9tIOeDfTxx wBWNe5dY2nsPRAs3KIz7FU7dlJ0i5sO4CcRp6r0E0xpEMcXEP9k1gUo+MXxJtRGEVJJJ giX4H1C6ELd0ku150fDJjHLZkTg3XD9CZZrfgTqnooERF867EdxKdCCB1//dfdkgciZP nioX/xo+JB1lpUU2WBhFs7uVozgLvo4FRPVPi6lp/ed4rMxl5BGclSqw1+/TeYDusHAE iepw== X-Gm-Message-State: AHPjjUgBCzfhGk2kqHRjoI5vGJkDJZKsxEUp78Wq8ofZq97b93wjrQ1O iCp/Jj8W1tEave5CvN7QTU8= X-Google-Smtp-Source: AOwi7QCM3TqAIAxewR2XRPGq7opp7UwVOWczFaycyb0Ln2fWHk3WzoRFxapBE3Prewx8EaDiTSHhqQ== X-Received: by 10.98.147.219 with SMTP id r88mr19611366pfk.0.1507099837755; Tue, 03 Oct 2017 23:50:37 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id z9sm24056316pgc.85.2017.10.03.23.50.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 23:50:36 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 04 Oct 2017 17:20:28 +1030 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH v2 7/9] ARM: dts: aspeed: Add aliases for UARTs Date: Wed, 4 Oct 2017 17:19:15 +1030 Message-Id: <20171004064917.2498-8-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> 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. Reviewed-by: Andrew Jeffery 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 b6ae7b62fd03..a549413bda3f 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 4c829e915c3e..de2dafa71651 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 {