From: Jisheng Zhang Date: Mon, 16 Nov 2015 10:43:37 +0000 (+0800) Subject: arm: dts: berlin2q-marvell-dmp: remove broken-cd from eMMC node X-Git-Tag: v4.5-rc1~43^2~37^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2523cc91e6c7ca570d8d04db2035f6b2eb2341f2;p=karo-tx-linux.git arm: dts: berlin2q-marvell-dmp: remove broken-cd from eMMC node The eMMC is non-removable so is marked with the non-removable DT property to avoid having to redetect it after a suspend/resume. But it also has the broken-cd property which is wrong since only one of the DT properties for card detection should be used Signed-off-by: Jisheng Zhang Signed-off-by: Sebastian Hesselbarth --- diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts index da28c9704a9d..cdcf89bfec33 100644 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@ -94,7 +94,6 @@ }; &sdhci2 { - broken-cd; bus-width = <8>; non-removable; status = "okay";