projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
r8a7779-marzen.dts
diff --git
a/arch/arm/boot/dts/r8a7779-marzen.dts
b/arch/arm/boot/dts/r8a7779-marzen.dts
index 20afea6f06ef6735d23c382a426e3a09438be457..fe396c8d58db798637a5fabaa74fe1f069c8089f 100644
(file)
--- a/
arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/
arch/arm/boot/dts/r8a7779-marzen.dts
@@
-19,12
+19,12
@@
compatible = "renesas,marzen", "renesas,r8a7779";
aliases {
compatible = "renesas,marzen", "renesas,r8a7779";
aliases {
- serial
2
= &scif2;
- serial
4
= &scif4;
+ serial
0
= &scif2;
+ serial
1
= &scif4;
};
chosen {
};
chosen {
- bootargs = "
console=ttySC2,115200
ignore_loglevel root=/dev/nfs ip=on";
+ bootargs = "ignore_loglevel root=/dev/nfs ip=on";
stdout-path = &scif2;
};
stdout-path = &scif2;
};