From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755453AbbBLKRj (ORCPT ); Thu, 12 Feb 2015 05:17:39 -0500 Received: from foss-mx-na.arm.com ([217.140.108.86]:43313 "EHLO foss-mx-na.foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751037AbbBLKRh (ORCPT ); Thu, 12 Feb 2015 05:17:37 -0500 Date: Thu, 12 Feb 2015 10:17:07 +0000 From: Mark Rutland To: Michal Simek Cc: "linux-arm-kernel@lists.infradead.org" , Andreas =?utf-8?Q?F=C3=A4rber?= , =?utf-8?B?U8O2cmVu?= Brinkmann , Russell King , "monstr@monstr.eu" , "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , Steffen Trumtrar , Kumar Gala , Peter Crosthwaite , Ian Campbell , Rob Herring , Pawel Moll , Rob Herring , Josh Cartwright Subject: Re: [PATCH v2] ARM: dts: zynq: Fix stdout-path and bootargs Message-ID: <20150212101707.GA1245@leverpostej> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 12, 2015 at 09:43:16AM +0000, Michal Simek wrote: > parallella - Remove linux,stdout-path. > Use stdout-path to identify kernel console > > Signed-off-by: Michal Simek It's nice to see this in use! Acked-by: Mark Rutland Mark. > --- > > Changes in v2: > - Remove linux,stdout-path reported by Mark Rutland > - Use stdout-path new console description with setting > - Change patch subject from "ARM: dts: zynq: Add linux,stdout-path and > stdout-path" > - Do not add 1/2 patch which added aliases node to zybo and parallella > > arch/arm/boot/dts/zynq-parallella.dts | 4 ++-- > arch/arm/boot/dts/zynq-zc702.dts | 3 ++- > arch/arm/boot/dts/zynq-zc706.dts | 3 ++- > arch/arm/boot/dts/zynq-zed.dts | 3 ++- > arch/arm/boot/dts/zynq-zybo.dts | 3 ++- > 5 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts > index 6a5f51daa708..e1e5b2423d26 100644 > --- a/arch/arm/boot/dts/zynq-parallella.dts > +++ b/arch/arm/boot/dts/zynq-parallella.dts > @@ -34,8 +34,8 @@ > }; > > chosen { > - bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; > - linux,stdout-path = "/amba/serial@e0001000"; > + bootargs = "earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait"; > + stdout-path = "serial0:115200n8"; > }; > }; > > diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts > index 1fc1d3911e9b..fb59d34e8ee6 100644 > --- a/arch/arm/boot/dts/zynq-zc702.dts > +++ b/arch/arm/boot/dts/zynq-zc702.dts > @@ -30,7 +30,8 @@ > }; > > chosen { > - bootargs = "console=ttyPS0,115200 earlyprintk"; > + bootargs = "earlyprintk"; > + stdout-path = "serial0:115200n8"; > }; > > leds { > diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts > index 850518d9b8ac..abf5d238ae04 100644 > --- a/arch/arm/boot/dts/zynq-zc706.dts > +++ b/arch/arm/boot/dts/zynq-zc706.dts > @@ -30,7 +30,8 @@ > }; > > chosen { > - bootargs = "console=ttyPS0,115200 earlyprintk"; > + bootargs = "earlyprintk"; > + stdout-path = "serial0:115200n8"; > }; > > usb_phy0: phy0 { > diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts > index 5658bc8434de..b9f2522012e8 100644 > --- a/arch/arm/boot/dts/zynq-zed.dts > +++ b/arch/arm/boot/dts/zynq-zed.dts > @@ -29,7 +29,8 @@ > }; > > chosen { > - bootargs = "console=ttyPS0,115200 earlyprintk"; > + bootargs = "earlyprintk"; > + stdout-path = "serial0:115200n8"; > }; > > usb_phy0: phy0 { > diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts > index 935a561f6aa6..16c9cacd668d 100644 > --- a/arch/arm/boot/dts/zynq-zybo.dts > +++ b/arch/arm/boot/dts/zynq-zybo.dts > @@ -29,7 +29,8 @@ > }; > > chosen { > - bootargs = "console=ttyPS0,115200 earlyprintk"; > + bootargs = "earlyprintk"; > + stdout-path = "serial0:115200n8"; > }; > > }; > -- > 1.8.2.3 > >