From: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Date: Tue, 22 Oct 2019 13:16:53 +0000 (+0200)
Subject: ARM: dts: imx6qdl-apf6dev: rename usb-h1-vbus regulator to 5V
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~3288^2~14^2~23
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=3f52c54ecb64351b0dc81c9ebcabcf54896ff463;p=linux.git

ARM: dts: imx6qdl-apf6dev: rename usb-h1-vbus regulator to 5V

This regulator supplies other devices and not only usb host1 so
rename it.

Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
index 4a22d83050dc..43013fcaf864 100644
--- a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -74,11 +74,12 @@
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 		regulator-always-on;
+		vin-supply = <&reg_5v>;
 	};
 
-	reg_usbh1_vbus: regulator-usb-h1-vbus {
+	reg_5v: regulator-5v {
 		compatible = "regulator-fixed";
-		regulator-name = "usb_h1_vbus";
+		regulator-name = "5V";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
 		regulator-always-on;
@@ -123,6 +124,7 @@
 &can2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_flexcan2>;
+	xceiver-supply = <&reg_5v>;
 	status = "okay";
 };
 
@@ -223,7 +225,7 @@
 };
 
 &usbh1 {
-	vbus-supply = <&reg_usbh1_vbus>;
+	vbus-supply = <&reg_5v>;
 	phy_type = "utmi";
 	status = "okay";
 };