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-usb
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
exynos4210-origen.dts
diff --git
a/arch/arm/dts/exynos4210-origen.dts
b/arch/arm/dts/exynos4210-origen.dts
index 5c9d2aed680b86a1a6e57f03a720b0a7356cd84e..3f877615844e107262316dead327905335f862d0 100644
(file)
--- a/
arch/arm/dts/exynos4210-origen.dts
+++ b/
arch/arm/dts/exynos4210-origen.dts
@@
-8,8
+8,8
@@
*/
/dts-v1/;
*/
/dts-v1/;
-
/include/
"skeleton.dtsi"
-
/include/ "exynos4
.dtsi"
+
#include
"skeleton.dtsi"
+
#include "exynos4210
.dtsi"
/ {
model = "Insignal Origen evaluation board based on Exynos4210";
/ {
model = "Insignal Origen evaluation board based on Exynos4210";
@@
-36,10
+36,10
@@
sdhci@12530000 {
samsung,bus-width = <4>;
samsung,timing = <1 2 3>;
sdhci@12530000 {
samsung,bus-width = <4>;
samsung,timing = <1 2 3>;
- cd-gpios = <&gp
io 0x200800
2 0>;
+ cd-gpios = <&gp
k2
2 0>;
};
sdhci@12540000 {
status = "disabled";
};
};
sdhci@12540000 {
status = "disabled";
};
-};
\ No newline at end of file
+};