[openwrt/openwrt] ipq40xx: use PHY to control USB GPIO

[LEDE Commits]

blogic pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/3bd2cee9bf85f01732e05e0c8fb070fb18c74095

commit 3bd2cee9bf85f01732e05e0c8fb070fb18c74095
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Tue Dec 3 13:37:21 2024 -0800

    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 at gmail.com>
    
    Link: https://github.com/openwrt/openwrt/pull/17221
    Signed-off-by: John Crispin <john at phrozen.org>
---
 .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts   | 7 ++-----
 target/linux/ipq40xx/generic/config-default                        | 1 -
 2 files changed, 2 insertions(+), 6 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
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