From patchwork Tue Dec 8 17:54:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 7800581 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3BA39BEEE5 for ; Tue, 8 Dec 2015 17:54:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FDE620383 for ; Tue, 8 Dec 2015 17:54:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8722C20340 for ; Tue, 8 Dec 2015 17:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751603AbbLHRyd (ORCPT ); Tue, 8 Dec 2015 12:54:33 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:53088 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751542AbbLHRyY (ORCPT ); Tue, 8 Dec 2015 12:54:24 -0500 Received: from ayla.of.borg ([84.195.106.123]) by michel.telenet-ops.be with bizsmtp id r5uN1r0022fm56U065uNnJ; Tue, 08 Dec 2015 18:54:22 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1a6MT0-0007eV-36; Tue, 08 Dec 2015 18:54:22 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1a6MT2-0008VD-4A; Tue, 08 Dec 2015 18:54:24 +0100 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Cc: linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 03/13] ARM: shmobile: armadillo800eva dts: Update console parameters Date: Tue, 8 Dec 2015 18:54:08 +0100 Message-Id: <1449597258-32623-4-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449597258-32623-1-git-send-email-geert+renesas@glider.be> References: <1449597258-32623-1-git-send-email-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change the console alias to "serial0", for consistency with other boards (the first unlabeled serial port is always called "serial0"). Drop the "console=" parameters from the kernel command line, as they're no longer needed for DT-based platforms. Add the serial port config to chosen/stdout-path. Signed-off-by: Geert Uytterhoeven --- arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts index 78a21f2828dff6d1..296a0d1c1fe266c7 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 { @@ -232,7 +232,7 @@ renesas,function = "gether"; }; - scifa1_pins: serial1 { + scifa1_pins: serial0 { renesas,groups = "scifa1_data"; renesas,function = "scifa1"; };