diff options
author | Oleksij Rempel <o.rempel@pengutronix.de> | 2022-02-11 14:30:33 +0100 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2022-02-13 06:19:37 +0100 |
commit | 9a6dbef4f234e648f7e0467f49d1f26575fc823d (patch) | |
tree | e33075319e1a56b1b5e2b2f5b920fc46a6864e06 /arch/arm/boot/dts/imx6qdl-vicut1.dtsi | |
parent | ARM: dts: imx6dl-prtvt7: Add missing tvp5150 video decoder node (diff) | |
download | linux-9a6dbef4f234e648f7e0467f49d1f26575fc823d.tar.xz linux-9a6dbef4f234e648f7e0467f49d1f26575fc823d.zip |
ARM: dts: imx6qdl-vicut1: add CAN termination support
The gpio1 0 pin is controlling CAN termination, not USB H1 VBUS. So,
remove wrong regulator and assign this gpio to new DT CAN termination
property.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-vicut1.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 12 |
1 files 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 @@ 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 @@ &can1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_can1>; + termination-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + termination-ohms = <150>; status = "okay"; }; @@ -492,7 +485,6 @@ }; &usbh1 { - vbus-supply = <®_h1_vbus>; pinctrl-names = "default"; phy_type = "utmi"; dr_mode = "host"; |