From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423180AbcFNC7y (ORCPT ); Mon, 13 Jun 2016 22:59:54 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:51468 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932797AbcFNC7w (ORCPT ); Mon, 13 Jun 2016 22:59:52 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u5E2wU10026058 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org Cc: Masahiro Yamada , linux-arm-kernel@lists.infradead.org, Russell King , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ARM: dts: uniphier: renumber serial aliases for Gentil/Vodka boards Date: Tue, 14 Jun 2016 11:59:46 +0900 Message-Id: <1465873186-30658-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465873186-30658-1-git-send-email-yamada.masahiro@socionext.com> References: <1465873186-30658-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On these two boards, the serial0 is used for inter-chip connection, so cannot be used for login console. The serial2 is used instead for them, but it is tedious to use because upper level deployment projects must switch login console per board. Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 8 ++++---- arch/arm/boot/dts/uniphier-proxstream2-vodka.dts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts b/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts index bf2619e..98d895b 100644 --- a/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts +++ b/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts @@ -55,13 +55,13 @@ }; chosen { - stdout-path = "serial2:115200n8"; + stdout-path = "serial0:115200n8"; }; aliases { - serial0 = &serial0; - serial1 = &serial1; - serial2 = &serial2; + serial0 = &serial2; + serial1 = &serial0; + serial2 = &serial1; i2c0 = &i2c0; i2c2 = &i2c2; i2c4 = &i2c4; diff --git a/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts b/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts index 498acac..1fb8bd7 100644 --- a/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts +++ b/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts @@ -55,13 +55,13 @@ }; chosen { - stdout-path = "serial2:115200n8"; + stdout-path = "serial0:115200n8"; }; aliases { - serial0 = &serial0; - serial1 = &serial1; - serial2 = &serial2; + serial0 = &serial2; + serial1 = &serial0; + serial2 = &serial1; i2c0 = &i2c0; i2c4 = &i2c4; i2c5 = &i2c5; -- 1.9.1