3 files changed, 37 insertions, 13 deletions

diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi
index 8ea4d57a6d3b..866ec857f231 100644
--- a/arch/arm/boot/dts/dra7-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra7-evm-common.dtsi
@@ -291,3 +291,19 @@
 &pcie1_rc {
         status = "okay";
 };
+
+&mmc4 {
+        bus-width = <4>;
+        cap-power-off-card;
+        keep-power-in-suspend;
+        ti,non-removable;
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+        wlcore: wlcore@2 {
+                compatible = "ti,wl1835";
+                reg = <2>;
+                interrupt-parent = <&gpio5>;
+                interrupts = <7 IRQ_TYPE_EDGE_RISING>;
+        };
+};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index eab47e32b2fa..79d13a298293 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -930,10 +930,6 @@ i2c_p3_exp: &i2c2 {
 &mmc4 {
         status = "okay";
         vmmc-supply = <&vmmcwl_fixed>;
-        bus-width = <4>;
-        cap-power-off-card;
-        keep-power-in-suspend;
-        ti,non-removable;
 
         pinctrl-names = "default-rev11", "default", "hs-rev11", "hs", "sdr12-rev11", "sdr12", "sdr25-rev11", "sdr25";
         pinctrl-0 = <&mmc4_pins_default &mmc4_iodelay_ds_rev11_conf>;
@@ -944,15 +940,6 @@ i2c_p3_exp: &i2c2 {
         pinctrl-5 = <&mmc4_pins_sdr12 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
         pinctrl-6 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev11_conf>;
         pinctrl-7 = <&mmc4_pins_sdr25 &mmc4_iodelay_sdr12_hs_sdr25_rev20_conf>;
-
-        #address-cells = <1>;
-        #size-cells = <0>;
-        wlcore: wlcore@2 {
-                compatible = "ti,wl1835";
-                reg = <2>;
-                interrupt-parent = <&gpio5>;
-                interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
-        };
 };
 
 &oppdm_mpu {
diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
index 24582a7b0acb..7056bd369461 100644
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@ -115,6 +115,16 @@
                 vin-supply = <&smps5_reg>;
         };
 
+        vmmcwl_fixed: fixedregulator-mmcwl {
+                compatible = "regulator-fixed";
+                regulator-name = "vmmcwl_fixed";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                gpio = <&gpio5 8 0>;    /* gpio5_8 */
+                startup-delay-us = <70000>;
+                enable-active-high;
+        };
+
         vtt_fixed: fixedregulator-vtt {
                 compatible = "regulator-fixed";
                 regulator-name = "vtt_fixed";
@@ -424,6 +434,17 @@
         pinctrl-3 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_conf>;
 };
 
+&mmc4 {
+        status = "okay";
+        vmmc-supply = <&vmmcwl_fixed>;
+
+        pinctrl-names = "default", "hs", "sdr12", "sdr25";
+        pinctrl-0 = <&mmc4_pins_hs &mmc4_iodelay_default_conf>;
+        pinctrl-1 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
+        pinctrl-2 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
+        pinctrl-3 = <&mmc4_pins_hs &mmc4_iodelay_manual1_conf>;
+};
+
 &oppdm_mpu {
         vdd-supply = <&buck10_reg>;
 };