Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / qcom / msm8994-sony-xperia-kitakami.dtsi

diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
index 4032b7478f04481e6452c87b02499599f9fc0329..791f254ac3f87dd56eb296b17b18a296ce1ed9b2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -221,7 +221,12 @@
 };
 
 &sdhc1 {
-       status = "okay";
+       /* There is an issue with the eMMC causing permanent
+        * damage to the card if a quirk isn't addressed.
+        * Until it's fixed, disable the MMC so as not to brick
+        * devices.
+        */
+       status = "disabled";
 
        /* Downstream pushes 2.95V to the sdhci device,
         * but upstream driver REALLY wants to make vmmc 1.8v