Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / arch / arm / dts / exynos4412-trats2.dts

diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412-trats2.dts
index 5269ae68a86edf11c8ef9021a8ceac3f84257bf9..cc58c878b82ba713f5ca8325642440dafcfd6d1f 100644 (file)
--- a/arch/arm/dts/exynos4412-trats2.dts
+++ b/arch/arm/dts/exynos4412-trats2.dts
@@ -417,6 +417,7 @@
                samsung,bus-width = <8>;
                samsung,timing = <1 3 3>;
                pwr-gpios = <&gpio 0xB2 0>;
+               status = "disabled";
        };
 
        sdhci@12520000 {
@@ -435,8 +436,11 @@
 
        dwmmc@12550000 {
                samsung,bus-width = <8>;
-               samsung,timing = <0 1 0>;
+               samsung,timing = <2 1 0>;
                pwr-gpios = <&gpio 0xB2 0>;
+               fifoth_val = <0x203f0040>;
+               bus_hz = <400000000>;
+               div = <0x3>;
                index = <4>;
        };
 };