Revert "ipq40xx: use PHY to control USB GPIO"

This reverts commit 3bd2cee. 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 <[email protected]> Link: openwrt/openwrt#17339 Signed-off-by: Robert Marko <[email protected]>
lede-project · Dec 23, 2024 · 0de59fb · 0de59fb
1 parent 363f52d
commit 0de59fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
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
@@ -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
@@ -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