Merge branches 'acpi-video' and 'acpi-hotplug'

[deliverable/linux.git] / arch / arm / boot / dts / exynos5250-snow-common.dtsi

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 0a7f408824d825bb1ba6e9de18e02f4a989eb1ad..5cb33ba5e296258e0b5104f5f2c0284815d8b75b 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -520,8 +520,7 @@
 &mmc_0 {
        status = "okay";
        num-slots = <1>;
-       broken-cd;
-       card-detect-delay = <200>;
+       non-removable;
        samsung,dw-mshc-ciu-div = <3>;
        samsung,dw-mshc-sdr-timing = <2 3>;
        samsung,dw-mshc-ddr-timing = <1 2>;
@@ -552,10 +551,9 @@
 &mmc_3 {
        status = "okay";
        num-slots = <1>;
-       broken-cd;
+       non-removable;
        cap-sdio-irq;
        keep-power-in-suspend;
-       card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;
        samsung,dw-mshc-sdr-timing = <2 3>;
        samsung,dw-mshc-ddr-timing = <1 2>;