Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Espressobin: Fix default env variables (Derek)
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 @@
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 @@
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++) {