UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: shmobile: r8a7790: switch console back to scif0 

The boot loader uses scif0, and so must we if we want earlycon to work.

Partially reverts 7c0558941 ("ARM: shmobile: r8a7790: switch from scif
to scifa").

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Ulrich Hecht 2015-11-13 17:22:23 +01:00 committed by Simon Horman
parent 998f468f34
commit 430d7baddf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/r8a7790-lager.dts
View File

@ -47,13 +47,13 @@
compatible = "renesas,lager", "renesas,r8a7790";
aliases {
serial0 = &scifa0;
serial0 = &scif0;
serial1 = &scifa1;
};
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
stdout-path = &scifa0;
stdout-path = &scif0;
};
memory@40000000 {
@ -296,9 +296,9 @@
renesas,function = "du";
};
scifa0_pins: serial0 {
renesas,groups = "scifa0_data";
renesas,function = "scifa0";
scif0_pins: serial0 {
renesas,groups = "scif0_data";
renesas,function = "scif0";
};
ether_pins: ether {
@ -467,8 +467,8 @@
};
};
&scifa0 {
pinctrl-0 = <&scifa0_pins>;
&scif0 {
pinctrl-0 = <&scif0_pins>;
pinctrl-names = "default";
status = "okay";