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 remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
ste-nomadik-s8815.dts
diff --git
a/arch/arm/boot/dts/ste-nomadik-s8815.dts
b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 85d3b95dfdba55b543aa0f66733df936d5074abc..3c140d05f7966c79ae0a0e9ed323baaf2a80adb6 100644
(file)
--- a/
arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/
arch/arm/boot/dts/ste-nomadik-s8815.dts
@@
-15,6
+15,10
@@
bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
};
+ aliases {
+ serial1 = &uart1;
+ };
+
src@101e0000 {
/* These chrystal drivers are not used on this board */
disable-sxtalo;