Re: [PATCH] arm64: dts: marvell: mcbin: add sdhci

Signed-off-by: Russell King <redacted>
---

This version labels up the uSD connector, adds the vqmmc regulator for
the uSD (the regulator itself already present in the DT), and supports
the card detect signal.

For eMMC, this version adds the vqmmc regulator, which again is already
present in the DT, marks it as not supporting SD or SDIO, and also
includes "slow mode" since testing with previous versions of the driver
have shown that selecting faster speeds results in errors.

 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts |   23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index cc167e05941a..60111ed3234a 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts

@@ -95,6 +95,21 @@
 	status = "okay";
 };
 
+&ap_sdhci0 {
+	bus-width = <8>;
+	/*
+	 * Not stable in HS modes - phy needs "more calibration", so add
+	 * the "slow-mode" and disable SDR104, SDR50 and DDR50 modes.
+	 */
+	marvell,xenon-phy-slow-mode;
+	no-1-8-v;
+	no-sd;
+	no-sdio;
+	non-removable;
+	status = "okay";
+	vqmmc-supply = <&v_vddo_h>;
+};
+
 &cpm_i2c0 {
 	clock-frequency = <100000>;
 	status = "okay";

@@ -105,6 +120,14 @@
 	status = "okay";
 };
 
+&cpm_sdhci0 {
+	/* U6 */
+	broken-cd;
+	bus-width = <4>;
+	status = "okay";
+	vqmmc-supply = <&v_3_3>;
+};
+
 &cpm_usb3_0 {
 	/* J38? - USB2.0 only */
 	status = "okay";

-- 
2.7.4