projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-socfpga
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
tegra124-nyan-big.dts
diff --git
a/arch/arm/dts/tegra124-nyan-big.dts
b/arch/arm/dts/tegra124-nyan-big.dts
index 3758395c6f7633c3bc0ad0820ad5000218aefb62..f1c97052a847e648e5ca2aecaadaa5dd33c73c12 100644
(file)
--- a/
arch/arm/dts/tegra124-nyan-big.dts
+++ b/
arch/arm/dts/tegra124-nyan-big.dts
@@
-8,7
+8,6
@@
aliases {
console = &uarta;
aliases {
console = &uarta;
- stdout-path = &uarta;
i2c0 = "/i2c@7000d000";
i2c1 = "/i2c@7000c000";
i2c2 = "/i2c@7000c400";
i2c0 = "/i2c@7000d000";
i2c1 = "/i2c@7000c000";
i2c2 = "/i2c@7000c400";
@@
-26,10
+25,12
@@
usb2 = "/usb@7d004000";
};
usb2 = "/usb@7d004000";
};
+ chosen {
+ stdout-path = &uarta;
+ };
+
host1x@50000000 {
host1x@50000000 {
- u-boot,dm-pre-reloc;
dc@54200000 {
dc@54200000 {
- u-boot,dm-pre-reloc;
display-timings {
timing@0 {
clock-frequency = <69500000>;
display-timings {
timing@0 {
clock-frequency = <69500000>;