Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos5420-arndale-octa.dts

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index fc2e983cb344e3237dc35c6e6dc1ac75bbde8512..aa7a7d727a7e80033df0cddb0b9cce8596d48ddc 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -50,7 +50,6 @@
        mmc@12200000 {
                status = "okay";
                broken-cd;
-               supports-highspeed;
                card-detect-delay = <200>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <0 4>;
@@ -58,28 +57,22 @@
                pinctrl-names = "default";
                pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;
                vmmc-supply = <&ldo10_reg>;
-
-               slot@0 {
-                       reg = <0>;
-                       bus-width = <8>;
-               };
+               bus-width = <8>;
+               cap-mmc-highspeed;
        };
 
        mmc@12220000 {
                status = "okay";
-               supports-highspeed;
                card-detect-delay = <200>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <2 3>;
                samsung,dw-mshc-ddr-timing = <1 2>;
                pinctrl-names = "default";
                pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-               vmmc-supply = <&ldo10_reg>;
-
-               slot@0 {
-                       reg = <0>;
-                       bus-width = <4>;
-               };
+               vmmc-supply = <&ldo19_reg>;
+               vqmmc-supply = <&ldo13_reg>;
+               bus-width = <4>;
+               cap-sd-highspeed;
        };
 
        hsi2c_4: i2c@12CA0000 {