projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
tegra30-colibri-eval-v3.dts
diff --git
a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index
3ff019f
..
76875c3
100644
(file)
--- a/
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@
-15,6
+15,10
@@
serial2 = &uartd;
};
serial2 = &uartd;
};
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
host1x@50000000 {
dc@54200000 {
rgb {
host1x@50000000 {
dc@54200000 {
rgb {
@@
-142,7
+146,7
@@
gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WAKEUP>;
debounce-interval = <10>;
gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WAKEUP>;
debounce-interval = <10>;
-
gpio-key,wakeup
;
+
wakeup-source
;
};
};
};
};