diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-13 14:33:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-13 14:33:02 -0500 |
| commit | 25711b07ca1dcf73dc41b45ca040dadbcff0fa08 (patch) | |
| tree | de49c129e19ab9b129aca41d59cd8ecdc3e18de7 /drivers/core | |
| parent | 743c562d0c5269740236864bdb0002e73ec3e614 (diff) | |
| parent | 6c9e3d1fc085977b5b38dfe610f65d1a7f48081b (diff) | |
Merge tag 'dm-pull-13jan22' of https://source.denx.de/u-boot/custodians/u-boot-dm
bloblist prep for standard passage
switch order of pinctrl and power domain calls
various minor fixes
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 4873c47d10b..d917d4e82da 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -518,6 +518,14 @@ int device_probe(struct udevice *dev) dev_or_flags(dev, DM_FLAG_ACTIVATED); + if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent && + (device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) && + !(drv->flags & DM_FLAG_DEFAULT_PD_CTRL_OFF)) { + ret = dev_power_domain_on(dev); + if (ret) + goto fail; + } + /* * Process pinctrl for everything except the root device, and * continue regardless of the result of pinctrl. Don't process pinctrl @@ -540,14 +548,6 @@ int device_probe(struct udevice *dev) dev->name, ret, errno_str(ret)); } - if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent && - (device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) && - !(drv->flags & DM_FLAG_DEFAULT_PD_CTRL_OFF)) { - ret = dev_power_domain_on(dev); - if (ret) - goto fail; - } - if (CONFIG_IS_ENABLED(IOMMU) && dev->parent && (device_get_uclass_id(dev) != UCLASS_IOMMU)) { ret = dev_iommu_enable(dev); |