From patchwork Wed Nov 14 22:22:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151135 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6260728ljp; Wed, 14 Nov 2018 14:37:46 -0800 (PST) X-Google-Smtp-Source: AJdET5c5Ymid7LDh6EJQjpoXTGIcKsE95Yjb/auZDDTHku1lq0YQtQJRBJsPiuHdQjWHrdI1Qzth X-Received: by 2002:a65:594b:: with SMTP id g11-v6mr3342499pgu.229.1542235066185; Wed, 14 Nov 2018 14:37:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542235066; cv=none; d=google.com; s=arc-20160816; b=DKH390IXvmIQWs7TMvzrqUP4O0NlBXAE/OtHNd4YiMvEOD+0HztVoSulEwBUtj43SF PNiyi6RSD8Al1MgXUGMd3mEsjiDGq4KIkJm7vx7Hrnb7AZRd6Pf9G3alf4TRF1/rTQXa ghj0ZII7wcuEAMpxbjya5ewLvss6y52sM4ZKqDpbFWig389y3aoMcWC6T8hIRB8lDfXM Rf9bGo0BOIkvrSZ8PhslhoobpMDjHMbDKGZpm/EW2csSG3a7Ur8NIIbQGkTixqlBNDta pl1zOLc/lsVntPPoIN6SrHBaO80tYYQ0TCiMgi3EYDAmj7QWI/Iqewx3kC2Sm1NlPV2v BNgA== 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; bh=obRV8rT8XEBUWT9uFVMJrjAaaHe0rpX11rHlCYh1iCo=; b=D22XdAXft+sAU+l9XuxHzYbIrtr+NMOUpomO3DBdKfVv+lKFFDLCDiFOUkVfbQqqlU gNsDBM4VbeDNyBAIW2myTrYKRZ0y/51RXoxgOyON331Jycilso4z1KUxJSj0ZIAEoMi6 0iGo+/K2hQu8nETcd/8zU8oUycTRIeR00NLL1cjTF+Gzbn3jP4RRoU/9qN6ZHw+3Pg0C IygP5I8p0neXR5542i0UVGOTtonOVf5v1MXog63wzhrA6CrVmygQMEpAKIuz9TtzVTs6 GxpkaUlISUwNfiJKSIY8sclKeldgRQp3YDncexQEgByY+XeKuQkWUAh/qPvx7JjLcPjD R4WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gS3f3rBN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j2-v6si27335989pfg.10.2018.11.14.14.37.45; Wed, 14 Nov 2018 14:37:46 -0800 (PST) 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=pass header.i=@kernel.org header.s=default header.b=gS3f3rBN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388533AbeKOImw (ORCPT + 32 others); Thu, 15 Nov 2018 03:42:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:36278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733164AbeKOI3Z (ORCPT ); Thu, 15 Nov 2018 03:29:25 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9C03322544; Wed, 14 Nov 2018 22:24:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234260; bh=8MWU8JAfSzjbGXva6fgpsaHEvMjZFsEwCcHtGRpQkCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gS3f3rBN+ZIgtenB+5Rn85/70K7uSXUOIX/xEb3e25HOH7JIUhUyIzucu6MFZu3S/ PMYXQH3rlwBDA/CQcteceU7nkZmx5wMLhaTaRRshdUqVrDMf61yWRdeJAGH/BvzGjo dujpOnaouDFD7YHlYKq7RMAae2rVv06Muh5A7xQI= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , Mark Rutland , Sasha Levin , devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 4.18 24/59] ARM: dts: fsl: Fix improperly quoted stdout-path values Date: Wed, 14 Nov 2018 17:22:56 -0500 Message-Id: <20181114222335.99339-24-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 1af6ab3bac8458fc2e92ad7bb97b62de4a1fddef ] A quoted label reference doesn't expand to the node path and is taken as a literal string. Dropping the quotes can fix this unless the baudrate string is appended in which case we have to use the alias. At least on VF610, the problem was masked by setting the console in bootargs. Use the alias syntax with baudrate parameter so we can drop setting the console in bootargs. Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: NXP Linux Team Cc: Mark Rutland Reviewed-by: Fabio Estevam Reviewed-by: Stefan Agner Signed-off-by: Rob Herring Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx53-ppd.dts | 2 +- arch/arm/boot/dts/vf610m4-colibri.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/arch/arm/boot/dts/imx53-ppd.dts b/arch/arm/boot/dts/imx53-ppd.dts index 3aa6f693fa9f..1228789f0f3a 100644 --- a/arch/arm/boot/dts/imx53-ppd.dts +++ b/arch/arm/boot/dts/imx53-ppd.dts @@ -55,7 +55,7 @@ }; chosen { - stdout-path = "&uart1:115200n8"; + stdout-path = "serial0:115200n8"; }; memory@70000000 { diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts index 41ec66a96990..ca6249558760 100644 --- a/arch/arm/boot/dts/vf610m4-colibri.dts +++ b/arch/arm/boot/dts/vf610m4-colibri.dts @@ -50,8 +50,8 @@ compatible = "fsl,vf610m4"; chosen { - bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw"; - stdout-path = "&uart2"; + bootargs = "clk_ignore_unused init=/linuxrc rw"; + stdout-path = "serial2:115200"; }; memory@8c000000 {