]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi
authorJavier Martinez Canillas <javier@osg.samsung.com>
Thu, 15 Oct 2015 16:51:08 +0000 (18:51 +0200)
committerKrzysztof Kozlowski <k.kozlowski@samsung.com>
Tue, 29 Dec 2015 00:07:09 +0000 (09:07 +0900)
The Exynos5800 Peach Pi Chromebook has a Marvell WiFi SDIO chip which
can't neither be removed nor be detected. But the node isn't marked
as non-removable and instead has the broken-cd DT property.

This causes the device to be removed when the system enters into a
suspend state and the following warnings is shown after a resume:

[  181.944636] mmc2: error -2 during resume (card was removed?)

Also remove the card-detect-delay property that is not needed with
non-removable.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
arch/arm/boot/dts/exynos5800-peach-pi.dts

index 49a4f43e5ac25c8ad16742cca0ccdebf9f9d194c..ca3a467a585d9bca1d6a949a17aae1dcaa3576bd 100644 (file)
@@ -672,10 +672,9 @@ &mmc_0 {
 &mmc_1 {
        status = "okay";
        num-slots = <1>;
-       broken-cd;
+       non-removable;
        cap-sdio-irq;
        keep-power-in-suspend;
-       card-detect-delay = <200>;
        clock-frequency = <400000000>;
        samsung,dw-mshc-ciu-div = <1>;
        samsung,dw-mshc-sdr-timing = <0 1>;