MLK-14334 ARM: dts: move regulator reg_vsd_3v3b to imx7ulp-evk-sd1.dts file

Since regulator reg_vsd_3v3b for SD1, and has pin confict with lpuart,
then move the regulator to SD1 specific dts file.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>

diff --git a/arch/arm/boot/dts/imx7ulp-evk-sd1.dts b/arch/arm/boot/dts/imx7ulp-evk-sd1.dts
index a081809..1dddfb2 100644 (file)
--- a/arch/arm/boot/dts/imx7ulp-evk-sd1.dts
+++ b/arch/arm/boot/dts/imx7ulp-evk-sd1.dts
@@ -9,6 +9,20 @@
 
 #include "imx7ulp-evk.dts"
 
+/ {
+       regulators {
+               reg_vsd_3v3b: regulator@2 {
+                       compatible = "regulator-fixed";
+                       reg = <2>;
+                       regulator-name = "VSD_3V3B";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+       };
+};
+
 &bcmdhd_wlan_0 {
        status = "disabled";
 };

diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts
index a1c83e1..f9a30a7 100644 (file)
--- a/arch/arm/boot/dts/imx7ulp-evk.dts
+++ b/arch/arm/boot/dts/imx7ulp-evk.dts
@@ -93,15 +93,6 @@
                        enable-active-high;
                };
 
-               reg_vsd_3v3b: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "VSD_3V3B";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
        };
 
        extcon_usb1: extcon_usb1 {