From: Shiji Yang <yangshiji66@qq.com>
Date: Sun, 22 Dec 2024 12:13:05 +0000 (+0800)
Subject: Revert "ipq40xx: use PHY to control USB GPIO"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0de59fb952b7784c8085e340367523276c97687c;p=openwrt%2Fstaging%2Fstintel.git

Revert "ipq40xx: use PHY to control USB GPIO"

This reverts commit 3bd2cee9bf85f01732e05e0c8fb070fb18c74095.

Based on my testing, we are unable to control USB power supply
through some third-party tools (e.g. uhubctl) or sysfs in userspace.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
Link: https://github.com/openwrt/openwrt/pull/17339
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
index 85ad382223..644329419d 100644
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
@@ -68,6 +68,11 @@
 		};
 	};
 
+	output-usb-power {
+		compatible = "regulator-output";
+		vout-supply = <&reg_usb>;
+	};
+
 	reg_usb: regulator-usb {
 		compatible = "regulator-fixed";
 
@@ -414,8 +419,6 @@
 
 &usb2_hs_phy {
 	status = "okay";
-
-	phy-supply = <&reg_usb>;
 };
 
 &watchdog {
diff --git a/target/linux/ipq40xx/generic/config-default b/target/linux/ipq40xx/generic/config-default
index bd9876a0b6..4999ad3622 100644
--- a/target/linux/ipq40xx/generic/config-default
+++ b/target/linux/ipq40xx/generic/config-default
@@ -3,4 +3,5 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_BLOCK=y
 CONFIG_MTD_UBI_NVMEM=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_UBIFS_FS=y