The gpio1 0 pin is controlling CAN termination, not USB H1 VBUS. So,
remove wrong regulator and assign this gpio to new DT CAN termnation
property.

Signed-off-by: Oleksij Rempel <o.rem...@pengutronix.de>
---
 arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi 
b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
index b9e305774fed..1ac7e13249d2 100644
--- a/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-vicut1.dtsi
@@ -126,15 +126,6 @@ reg_3v3: regulator-3v3 {
                regulator-max-microvolt = <3300000>;
        };
 
-       reg_h1_vbus: regulator-h1-vbus {
-               compatible = "regulator-fixed";
-               regulator-name = "h1-vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
        reg_otg_vbus: regulator-otg-vbus {
                compatible = "regulator-fixed";
                regulator-name = "otg-vbus";
@@ -212,6 +203,8 @@ IMX_AUDMUX_V2_PTCR_SYN              
IMX_AUDMUX_V2_PDCR_RXDSEL(0)
 &can1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_can1>;
+       termination-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+       termination-ohms = <150>;
        status = "okay";
 };
 
@@ -492,7 +485,6 @@ &uart5 {
 };
 
 &usbh1 {
-       vbus-supply = <&reg_h1_vbus>;
        pinctrl-names = "default";
        phy_type = "utmi";
        dr_mode = "host";
-- 
2.30.2

Reply via email to