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 branch 'next' of git://git.denx.de/u-boot-video
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
am335x-evm.dts
diff --git
a/arch/arm/dts/am335x-evm.dts
b/arch/arm/dts/am335x-evm.dts
index e1c5d4f76c6d66cecc8a6f3690464d39f5de65f6..a6f20af648abe005c5a36dc5634434b4b407e81e 100644
(file)
--- a/
arch/arm/dts/am335x-evm.dts
+++ b/
arch/arm/dts/am335x-evm.dts
@@
-16,6
+16,7
@@
chosen {
stdout-path = &uart0;
+ tick-timer = &timer2;
};
cpus {
@@
-716,7
+717,7
@@
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
- cd-gpios = <&gpio0 6 GPIO_ACTIVE_
HIGH
>;
+ cd-gpios = <&gpio0 6 GPIO_ACTIVE_
LOW
>;
};
&mmc3 {