diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-12 08:59:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-12 08:59:13 -0500 |
| commit | b560f2c61f2d7eefd40a8650799a23ab77e88c81 (patch) | |
| tree | 90f084997c3e74d6a7e7e8256f307ecefffd084b | |
| parent | 7a7b0856ca01f0dadc940f6f1bc6df44129ad9d0 (diff) | |
| parent | 30257f4699e0e58818f6e6f86021a994f485ee58 (diff) | |
| download | u-boot-b560f2c61f2d7eefd40a8650799a23ab77e88c81.zip u-boot-b560f2c61f2d7eefd40a8650799a23ab77e88c81.tar.gz u-boot-b560f2c61f2d7eefd40a8650799a23ab77e88c81.tar.bz2 | |
Merge tag 'u-boot-stm32-20221212' of https://source.denx.de/u-boot/custodians/u-boot-stm
phy: usbphyc: use regulator_set_enable_if_allowed for disabling vbus supply
dm: pmic: ignore disabled node in pmic_bind_children
| -rw-r--r-- | drivers/phy/phy-stm32-usbphyc.c | 2 | ||||
| -rw-r--r-- | drivers/power/pmic/pmic-uclass.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c index 9f0b7d7..dcf2194 100644 --- a/drivers/phy/phy-stm32-usbphyc.c +++ b/drivers/phy/phy-stm32-usbphyc.c @@ -375,7 +375,7 @@ static int stm32_usbphyc_phy_power_off(struct phy *phy) return 0; if (usbphyc_phy->vbus) { - ret = regulator_set_enable(usbphyc_phy->vbus, false); + ret = regulator_set_enable_if_allowed(usbphyc_phy->vbus, false); if (ret) return ret; } diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c index 5dcf6d8..0e2f5e1 100644 --- a/drivers/power/pmic/pmic-uclass.c +++ b/drivers/power/pmic/pmic-uclass.c @@ -39,6 +39,10 @@ int pmic_bind_children(struct udevice *pmic, ofnode parent, node_name = ofnode_get_name(node); debug("* Found child node: '%s'\n", node_name); + if (!ofnode_is_enabled(node)) { + debug(" - ignoring disabled device\n"); + continue; + } child = NULL; for (info = child_info; info->prefix && info->driver; info++) { |