summary refs log tree commit diff
diff options
context:
space:
mode:
authorSébastien Szymanski <sebastien.szymanski@armadeus.com>2019-10-22 15:16:53 +0200
committerShawn Guo <shawnguo@kernel.org>2019-10-28 14:48:49 +0800
commit3f52c54ecb64351b0dc81c9ebcabcf54896ff463 (patch)
treefcefd0fd3c867cafd6dcd6b93ffa1b6bc471d7f9
parenta18b9142057bc0535da4a6bbd36b37540191b955 (diff)
downloadlinux-3f52c54ecb64351b0dc81c9ebcabcf54896ff463.tar.gz
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>
-rw-r--r--arch/arm/boot/dts/imx6qdl-apf6dev.dtsi8
1 files changed, 5 insertions, 3 deletions
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";
 };