From patchwork Thu Jun 30 14:15:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9208341 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 4D2276075F for ; Thu, 30 Jun 2016 14:51:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D6E12867F for ; Thu, 30 Jun 2016 14:51:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3244228681; Thu, 30 Jun 2016 14:51:52 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8B59428680 for ; Thu, 30 Jun 2016 14:51:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIdI8-0002TE-4m; Thu, 30 Jun 2016 14:50:08 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIcnc-00069k-QA for linux-arm-kernel@lists.infradead.org; Thu, 30 Jun 2016 14:18:39 +0000 Received: from penelope.kanocho.kobe.vergenet.net (unknown [130.37.168.194]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 4B20525BEF0; Fri, 1 Jul 2016 00:17:15 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1467296235; bh=AhgU+wOJFi7PlX3uRHoFnuCwedoxMDtq28UUlHe3Uvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FGsuE/Kx06Hqfe3vbTaVWn47vvpuEtX7vvu+zqYPmTVROgu5TTtors/sfuU6EdYrT GveclbEz8czyrv+h2iYIq6wGKG8daylselta+h+AEogjMwzhYt6ak/JhHo6roIYzqu +tbkzPLfFIVNwPE0UfLUxmij5RHWhdaMnoB/zAVI= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 0928B66B45; Thu, 30 Jun 2016 16:16:03 +0200 (CEST) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Subject: [PATCH 32/41] ARM: dts: armadillo800eva: Update console parameters Date: Thu, 30 Jun 2016 16:15:52 +0200 Message-Id: <1403e38b829acdad5679862a5949e408bca2279a.1467294011.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160630_071837_352370_932D1D8C X-CRM114-Status: UNSURE ( 9.01 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Horman , Magnus Damm , Geert Uytterhoeven , 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 From: Geert Uytterhoeven Change the console alias to "serial0", for consistency with other boards (the first unlabeled serial port is always called "serial0"). This does change the serial console from /dev/ttySC1 to /dev/ttySC0. Add the serial port config to "chosen/stdout-path", which requires referring to the port by alias. Drop the "console=" parameters from the kernel command line, as they're no longer needed for DT-based platforms. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts index 6866f61a350c..7885075428bb 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts @@ -20,12 +20,12 @@ compatible = "renesas,armadillo800eva", "renesas,r8a7740"; aliases { - serial1 = &scifa1; + serial0 = &scifa1; }; chosen { - bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw"; - stdout-path = &scifa1; + bootargs = "earlyprintk ignore_loglevel root=/dev/nfs ip=dhcp rw"; + stdout-path = "serial0:115200n8"; }; memory@40000000 {