From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 3 Dec 2024 21:37:21 +0000 (-0800)
Subject: ipq40xx: use PHY to control USB GPIO
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3bd2cee9bf85f01732e05e0c8fb070fb18c74095;p=openwrt%2Fopenwrt.git

ipq40xx: use PHY to control USB GPIO

Instead of using regulator-output to manually control USB GPIO, let the
PHY handle it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Link: https://github.com/openwrt/openwrt/pull/17221
Signed-off-by: John Crispin <john@phrozen.org>
---

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 644329419d..85ad382223 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,11 +68,6 @@
 		};
 	};
 
-	output-usb-power {
-		compatible = "regulator-output";
-		vout-supply = <&reg_usb>;
-	};
-
 	reg_usb: regulator-usb {
 		compatible = "regulator-fixed";
 
@@ -419,6 +414,8 @@
 
 &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 4999ad3622..bd9876a0b6 100644
--- a/target/linux/ipq40xx/generic/config-default
+++ b/target/linux/ipq40xx/generic/config-default
@@ -3,5 +3,4 @@ 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