From: Haibo Chen <haibo.chen@nxp.com>
Date: Wed, 25 Apr 2018 08:03:24 +0000 (+0800)
Subject: MLK-18127 ARM: dts: imx7ulp-evk: few correction for usdhc1
X-Git-Tag: C0P2-H0.0--20200415~54
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=f411037dbc0b61c3a3bae25b0d144df5e565e501;p=linux.git

MLK-18127 ARM: dts: imx7ulp-evk: few correction for usdhc1

Currently, WiFi only work on SDIO2.0 mode, so add property
"no-1-8-v", otherwise following warning log will be print

sdhci-esdhc-imx 40380000.usdhc: could not get ultra high speed state, work on normal mode

The regulator reg_vsd_3v3 and reg_sd1_vmmc has the same
regulator name, so will trigger the following error log:

VSD_3V3: Failed to create debugfs directory

So change the regulator name of reg_sd1_vmmc.

According to the spec suggestion, ibe need to be enabled
for usdhc clock pin, and clock is better to pull down.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
(cherry picked from commit b62dd733a100e35e93543642149bcf8b61e13242)
---

diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts
index 3cc46ca0c87e..0be1684dfd9f 100644
--- a/arch/arm/boot/dts/imx7ulp-evk.dts
+++ b/arch/arm/boot/dts/imx7ulp-evk.dts
@@ -82,7 +82,7 @@
 
 		reg_sd1_vmmc: sd1_regulator {
 			compatible = "regulator-fixed";
-			regulator-name = "VSD_3V3";
+			regulator-name = "WLAN_EN";
 			regulator-min-microvolt = <3300000>;
 			regulator-max-microvolt = <3300000>;
 			gpio = <&rpmsg_gpio0 14 GPIO_ACTIVE_HIGH>;
@@ -343,7 +343,7 @@
 		pinctrl_usdhc1: usdhc1grp {
 			fsl,pins = <
 				IMX7ULP_PAD_PTE3__SDHC1_CMD		0x43
-				IMX7ULP_PAD_PTE2__SDHC1_CLK		0x43
+				IMX7ULP_PAD_PTE2__SDHC1_CLK		0x10042
 				IMX7ULP_PAD_PTE1__SDHC1_D0		0x43
 				IMX7ULP_PAD_PTE0__SDHC1_D1		0x43
 				IMX7ULP_PAD_PTE5__SDHC1_D2		0x43
@@ -558,6 +558,7 @@
 	pinctrl-0 = <&pinctrl_usdhc1>;
 	pinctrl-1 = <&pinctrl_usdhc1>;
 	bus-width = <4>;
+	no-1-8-v;
 	vmmc-supply = <&reg_sd1_vmmc>;
 	pm-ignore-notify;
 	keep-power-in-suspend;