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: 9983957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2957E602B8 for ; Wed, 4 Oct 2017 07:14:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10AC928757 for ; Wed, 4 Oct 2017 07:14:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03B7828A9D; Wed, 4 Oct 2017 07:14:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9F43F28757 for ; Wed, 4 Oct 2017 07:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1BB0jtaMa62WlBAkFuZKK2QECO492KQG3CTereTh0sU=; b=GotTxnYDaKH8sSrbRDzVg/EwXa 4GQT4MhUVNCyxCTk8NdgogMK2JexUDp7QE4E0dfBgZGQbJ4aE7AoAqEJl++eE7MJf7V1phH5jxM49 CsxNq/iJ3Iz3cF0BM4D0SCcLbaNp2FRAwyOCj1kRh7mk1lCRXTvF34fHm5BGpKRztCP68OVu0+lxW EVBudVxdOWOiZyZ54+mGhIEEMQ7tNLOn7osbgaTmwknjNva4Tbm99PXuCiH20mPRCk3GNwOfKIdsk /N1l9JdVxcUm7S579e+f1bPByXl4LY4uUAWwazbV+KpngPTHHq8uignsIdGgepdrTNes2xha3LF3W im9Krd9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dzdtG-00028I-3D; Wed, 04 Oct 2017 07:14:46 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzdl2-0006Hu-Fv for linux-arm-kernel@bombadil.infradead.org; Wed, 04 Oct 2017 07:06:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UL5BAYDkNYv9P+XJBebD5hm/DvqWd2f3XRTHgOw1koA=; b=nBbTzYmDRfOURXgmpXCR9EE0Z CNMziuuchBafcFm4/FjYXnZwtM/TI35/evuJEjv88qjN6yfQLeX8zyzFnGVguPeq9w0cIGwiQpgwW ZGWgf+VDRPlUVcFm6MfyZ1zhUmcQx2/Zm61Lk1vbarysD7/9q+Zjf9jQUNgqBDQP2GpFcQrx8p3aT dpUg3DgPvFQzm1+JaArRgYqBbz5KT5BA/LyM8XsLQAefMqZlzQ2fB/dPKWjuuWbHQvXj7jpF46UKK KdpBsVYU4lwFtVPebbgHI1dFl0j5gqe1oP+54LmlpYhpJoi/lSDEdfUgVfxv5Ff5Vpet3jIdsTCkZ 9lPyrHncQ==; Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzdWF-0004Iu-Mx for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 06:51:01 +0000 Received: by mail-pf0-x241.google.com with SMTP id i23so11546230pfi.2 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=M0APEG63vbFhBRhnLum5FuNIhfLzxw2IUJ6ink2hkjekd35LtJ3OlNAwYO92aQxGE6 tr/3MpenQRaMquWASsYOnec+qKvd/n7vhxmvZZJ3oyi9hM8ZVb8gXmdokbGlNysyrj6w zLfJuz9Ows5qKjTvaocI8RWrCQ0F3bYxYfKqUkAf0Q6lP0CrILb+TfsxGQaFNBIIPHCG 4R96bLEeJr8mX9JgL7jxzfQlR0KtkH2D2h87KkvNmLN7US/owsn4rH5eP/jA2cI1bD+Q pOBl2vSYcDt5QAg2IgaHNvf5QDlX/an4J/hqptqQR+Jt8f0JPT1u1BRg6pUC0o8GFbHI QuxA== X-Gm-Message-State: AHPjjUjiiboyVCNEyyY/R4ppSXrzwu71ll/9/csxzKbJkHxXjF0gtsWZ WkGUX+cnUvHHk6NnplA3VNA= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171004_075059_902031_05242A21 X-CRM114-Status: GOOD ( 12.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery , Brendan Higgins , Russell King , linux-kernel@vger.kernel.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Rick Altherr , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 {