Merge tag 'clk-for-linus-3.14-part1' of git://git.linaro.org/people/mike.turquette...

[linux-2.6-block.git] / arch / arm / boot / dts / exynos4412-trats2.dts

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index c21a8b916bf13d21a3fcb429d20c193cd9fba448..4f851ccf40eb48831ebb78474dd458eebf873b58 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -443,13 +443,25 @@
                };
        };
 
-       sdhci@12510000 {
-               bus-width = <8>;
+       mmc@12550000 {
+               num-slots = <1>;
+               supports-highspeed;
+               broken-cd;
                non-removable;
-               pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
-               pinctrl-names = "default";
+               card-detect-delay = <200>;
                vmmc-supply = <&vemmc_reg>;
+               clock-frequency = <400000000>;
+               samsung,dw-mshc-ciu-div = <0>;
+               samsung,dw-mshc-sdr-timing = <2 3>;
+               samsung,dw-mshc-ddr-timing = <1 2>;
+               pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
+               pinctrl-names = "default";
                status = "okay";
+
+               slot@0 {
+                       reg = <0>;
+                       bus-width = <8>;
+               };
        };
 
        serial@13800000 {