4.19-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Alistair Strachan <astrac...@google.com>

commit 8d26c1390aec795d492b8de5e4437751e8805a1d upstream.

This reverts commit abd7d0972a192ee653efc7b151a6af69db58f2bb. This
change was already partially reverted by John Stultz in
commit 9c6d26df1fae ("arm64: dts: hikey: Fix eMMC corruption regression").

This change appears to cause controller resets and block read failures
which prevents successful booting on some hikey boards.

Cc: Ryan Grachek <r...@edited.us>
Cc: Wei Xu <xuw...@hisilicon.com>
Cc: Manivannan Sadhasivam <manivannan.sadhasi...@linaro.org>
Cc: Rob Herring <robh...@kernel.org>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: linux-arm-ker...@lists.infradead.org
Cc: devicet...@vger.kernel.org
Cc: stable <sta...@vger.kernel.org> #4.17+
Signed-off-by: Alistair Strachan <astrac...@google.com>
Signed-off-by: John Stultz <john.stu...@linaro.org>
Signed-off-by: Wei Xu <xuw...@hisilicon.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts |    1 -
 1 file changed, 1 deletion(-)

--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -301,7 +301,6 @@
 
                dwmmc_0: dwmmc0@f723d000 {
                        cap-mmc-highspeed;
-                       mmc-hs200-1_8v;
                        non-removable;
                        bus-width = <0x8>;
                        vmmc-supply = <&ldo19>;


Reply via email to