diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2014-05-14 03:10:09 +0200 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-05-14 11:42:52 +0900 |
commit | 5be13fefdb83c15ed69eb032dfe011162d1a5269 (patch) | |
tree | 28cbe8f2a651805e887fb5917b1f863534d2fa6f | |
parent | 4c84c1b3accabdfb7aa8e98a4644c94df0703bb0 (diff) | |
download | op-kernel-dev-5be13fefdb83c15ed69eb032dfe011162d1a5269.zip op-kernel-dev-5be13fefdb83c15ed69eb032dfe011162d1a5269.tar.gz |
ARM: shmobile: r7s72100: genmai: add uart alias and activate scif2 as console
We keep the UART naming backwards compatible with the legacy version.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/boot/dts/r7s72100-genmai-reference.dts | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts index 941e72c..ca88458 100644 --- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts +++ b/arch/arm/boot/dts/r7s72100-genmai-reference.dts @@ -1,7 +1,8 @@ /* * Device Tree Source for the Genmai board * - * Copyright (C) 2013 Renesas Solutions Corp. + * Copyright (C) 2013-14 Renesas Solutions Corp. + * Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com> * * This file is licensed under the terms of the GNU General Public License * version 2. This program is licensed "as is" without any warranty of any @@ -15,6 +16,10 @@ model = "Genmai"; compatible = "renesas,genmai-reference", "renesas,r7s72100"; + aliases { + serial2 = &scif2; + }; + chosen { bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; }; @@ -48,3 +53,7 @@ pagesize = <64>; }; }; + +&scif2 { + status = "okay"; +}; |