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: 114750 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp5636522edb; Tue, 3 Oct 2017 23:50:44 -0700 (PDT) X-Received: by 10.84.191.131 with SMTP id a3mr6699306pld.253.1507099844176; Tue, 03 Oct 2017 23:50:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507099844; cv=none; d=google.com; s=arc-20160816; b=zqPVxXYwzdAoZBKrL5LDoQfUUkZioHIth95bqHR8jsl7IaTMxqTuwB3rJkoGsz0PDK y4HVc4X+IVgr9wbOUI06fAL0S+di5IrUNSoLhn3PzAszvNrqGQn2CvryFDwNWa7rVUTj AvXeBjHCQhNDVOH1yVEdxT5bgUeM4qPX3X2izVaGrEoLABcywaaS7sLwi6tICCPjdTjL wzV7/7A0CiN2OA3sLn3q2HgPe6kOcDOD+FlAXKV2kHL1Jmit23CeaL/Z8y15Os8xo1dy VvRnBZlfavNwRkOFvUDKJvJWGoyiR/uxsr1Rt1MagdJJVkVvWpUtVhzYH/Lfo3J4p9JB SbaA== 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=UL5BAYDkNYv9P+XJBebD5hm/DvqWd2f3XRTHgOw1koA=; b=wkOxrJ1r16b02TyOk4R2JvbTKHka4a5dvvH7N1AJJnKyyQY3AZGT8d8uRgyA3MtwwL gk/1kYveM/UayvsE4brFaPjpFtn9iuZqA5Ns4fWPtrMTUlbSKnhnzzobLEXBIWqWvmu6 +6Nra5Ltx9U/frKghBz2/U4jcMMnRCC7liBOVVVzk/TW7bQrYsd0z1DQSTMzDRciCrpK OvNRdXDVSQjbOAMRGzG2E8twg6WbQnOdcyGCCn3MrG1BchCQ5WzhquK4lSeRDQwqGpo0 c/qXsUFOdL5lclTJQektqm5xJVU3JlT4SsOLqSKPN7aXTC4g/id5+H4RR5Tp/ocGtyn+ cj0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=IQohDkOb; 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 l89si11231472pfk.260.2017.10.03.23.50.43; Tue, 03 Oct 2017 23:50:44 -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=IQohDkOb; 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 S1751832AbdJDGul (ORCPT + 26 others); Wed, 4 Oct 2017 02:50:41 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:37289 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751776AbdJDGui (ORCPT ); Wed, 4 Oct 2017 02:50:38 -0400 Received: by mail-pf0-f194.google.com with SMTP id e69so11527176pfg.4; Tue, 03 Oct 2017 23:50:38 -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=kYkdv6SMHFmqBWbexXOG7wHUuWYDN7XXQQtwzWfB1AaYavcGbuQWAcaXwOnTTft7WI ji0jKq0yNPItw7IUmK3JXgEHw6sYy/0zv/QgWlFjaS4qzJjXn5MkdAO7sGBxRbpJBafZ 4XnnfMva5MqYCsvYbQx6zOZx+NIOllMtwHWy+A8B5dPlEdM0wStn6w4HT88+TB53vWT3 GAPBZq0oWbGozQkl5/iG0M61tWFIYgX/+Rcl301SArc6DpjwKgM6NVWTaa0qRO3tG+iT JifNz1qFUhxqrlNFvXuG4v2iJBSzqlb9IJYO/mfH6VY+zZxT4dYLLBqSWm3gc7K3/Wew ZVTg== X-Gm-Message-State: AHPjjUgz1WVwrwGh+ej6B97FA9PPhSHgilaU8ecYJfGnmIYSCGDW3TW4 S9G+41LfFVcW1felwtNIpZI= 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 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 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> 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. 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(-) -- 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 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 {