From 51a8222eb23c0f305bb7534943f81ad7f4890fb1 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Sun, 22 Dec 2024 20:13:05 +0800 Subject: [PATCH] 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 --- .../arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts | 7 +++++-- target/linux/ipq40xx/generic/config-default | 1 + 2 files changed, 6 insertions(+), 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 index 85ad382223d..644329419d9 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 = <®_usb>; + }; + reg_usb: regulator-usb { compatible = "regulator-fixed"; @@ -414,8 +419,6 @@ &usb2_hs_phy { status = "okay"; - - phy-supply = <®_usb>; }; &watchdog { diff --git a/target/linux/ipq40xx/generic/config-default b/target/linux/ipq40xx/generic/config-default index bd9876a0b64..4999ad36223 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