summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiji Yang2024-12-22 12:13:05 +0000
committerRobert Marko2024-12-23 15:47:41 +0000
commit0de59fb952b7784c8085e340367523276c97687c (patch)
tree70d06cf2ad48d2c40f60b6678e2713c8d3055669
parent363f52d067e1852d46ccdc3ab4d12bc2f9d018dd (diff)
downloadopenwrt-0de59fb952b7784c8085e340367523276c97687c.tar.gz
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>
-rw-r--r--target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts7
-rw-r--r--target/linux/ipq40xx/generic/config-default1
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 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