ARM: dts: colibri-imx6: move vbus-supply to module level device tree

Move USB VBUS supply from single carrier board to module level device
tree. This pin is as per Colibri module family standard.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
index 74e8a6cd8bed607cce3c028d326b59e36bfba4d3..a28e083f29d5db9ca1bb9c31fcb5d6ea8b2c4681 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
@@ -99,7 +99,6 @@
 };
 
 &usbh1 {
-       vbus-supply = <&reg_usb_host_vbus>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 7272edd85a492ad905ebd82b3075b2880e96e77e..a02981d4a3fce717dd059d720f4cf01f95486b32 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -111,7 +111,6 @@
 };
 
 &usbh1 {
-       vbus-supply = <&reg_usb_host_vbus>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris.dts b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
index cf77d894f6d74cab788e3948f04c685228e6230b..c5797ff35b71b1c8efb42943d7a02ad218fd5f7e 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-colibri-iris.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
@@ -138,7 +138,6 @@
 };
 
 &usbh1 {
-       vbus-supply = <&reg_usb_host_vbus>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 3e98b5da0cc68cd5c152424069ac46235d7bc28a..21c5049bda4eec8168428ac3affb7b93e2813ac2 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -112,7 +112,7 @@
 
        reg_usb_host_vbus: regulator-usb-host-vbus {
                compatible = "regulator-fixed";
-               gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; /* USBH_PEN */
+               gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; /* SODIMM 129 / USBH_PEN */
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
                regulator-max-microvolt = <5000000>;
@@ -677,6 +677,11 @@
        status = "disabled";
 };
 
+/* Colibri USBH */
+&usbh1 {
+       vbus-supply = <&reg_usb_host_vbus>;
+};
+
 /* Colibri USBC */
 &usbotg {
        disable-over-current;
@@ -995,7 +1000,7 @@
 
        pinctrl_regulator_usbh_pwr: gpioregusbhpwrgrp {
                fsl,pins = <
-                       /* USBH_EN */
+                       /* SODIMM 129 / USBH_PEN */
                        MX6QDL_PAD_EIM_D31__GPIO3_IO31  0x0f058
                >;
        };