diff options
| author | Andy Duan <fugang.duan@nxp.com> | 2017-03-06 13:41:54 +0800 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-09 22:19:11 +0800 |
| commit | b190f9ad2128409e77244c738a8defcaade5454a (patch) | |
| tree | a8781fd69ee079fb823d87bab65779579008ae33 | |
| parent | 8a5a1e0200f7e05cee636624b594cf2356643746 (diff) | |
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>
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk-sd1.dts | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk.dts | 9 |
2 files changed, 14 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/imx7ulp-evk-sd1.dts b/arch/arm/boot/dts/imx7ulp-evk-sd1.dts index a081809912d2..1dddfb214cf9 100644 --- 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 a1c83e12ceeb..f9a30a797b6b 100644 --- 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 { |