Merge branch 'master' into improve-wording

mirror · Dec 19, 2024 · 31cd8ed · 31cd8ed
2 parents eef927e + 4fad9f1
commit 31cd8ed
Show file tree

Hide file tree

Showing 5 changed files with 8,206 additions and 8,210 deletions.
diff --git a/src/linux/universal/linux-6.6-nss/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts b/src/linux/universal/linux-6.6-nss/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts
@@ -367,6 +367,8 @@
 
 &qusb_phy_0 {
 	status = "okay";
+
+	vdd-supply = <&reg_usb_vbus>;
 };
 
 &ssphy_0 {

diff --git a/src/linux/universal/linux-6.6-nss/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts b/src/linux/universal/linux-6.6-nss/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts
@@ -162,16 +162,6 @@
 		enable-active-high;
 		regulator-boot-on;
 	};
-
-	output-usb0-power {
-		compatible = "regulator-output";
-		vout-supply = <&usb0_vbus>;
-	};
-
-	output-usb1-power {
-		compatible = "regulator-output";
-		vout-supply = <&usb1_vbus>;
-	};
 };
 
 &cpu0_thermal {
@@ -381,6 +371,8 @@
 
 &qusb_phy_0 {
 	status = "okay";
+
+	vdd-supply = <&usb0_vbus>;
 };
 
 &ssphy_1 {
@@ -389,6 +381,8 @@
 
 &qusb_phy_1 {
 	status = "okay";
+
+	vdd-supply = <&usb1_vbus>;
 };
 
 &usb_0 {