diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-24 16:24:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-24 16:24:50 -0400 |
| commit | f9b65c76b4828efbf8093c6b02bee5af0045b98b (patch) | |
| tree | 1429cb8e3cdfea42b63778ddf06ad0b33fb7bcf0 /drivers/core | |
| parent | a9aa4c5700c68c070d63a391b51ea8d341b6e8a6 (diff) | |
| parent | 44e02e39a91cd91aae5a28d90259d3a6996010bf (diff) | |
Merge tag 'dm-pull-24jul19-take3' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
Minor driver-model fixes and tweaks
A few device-tree fixes
Binman support for extracting files from an image
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 17 | ||||
| -rw-r--r-- | drivers/core/ofnode.c | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 0d15e5062b..474c1642ee 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -388,7 +388,8 @@ int device_probe(struct udevice *dev) if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL) pinctrl_select_state(dev, "default"); - if (dev->parent && device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) { + if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent && + device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) { if (!power_domain_get(dev, &pd)) power_domain_on(&pd); } @@ -409,10 +410,16 @@ int device_probe(struct udevice *dev) goto fail; } - /* Process 'assigned-{clocks/clock-parents/clock-rates}' properties */ - ret = clk_set_defaults(dev); - if (ret) - goto fail; + /* Only handle devices that have a valid ofnode */ + if (dev_of_valid(dev)) { + /* + * Process 'assigned-{clocks/clock-parents/clock-rates}' + * properties + */ + ret = clk_set_defaults(dev); + if (ret) + goto fail; + } if (drv->probe) { ret = drv->probe(dev); diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 179a6447dc..2ac73af934 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -884,5 +884,5 @@ int ofnode_set_enabled(ofnode node, bool value) if (value) return ofnode_write_string(node, "status", "okay"); else - return ofnode_write_string(node, "status", "disable"); + return ofnode_write_string(node, "status", "disabled"); } |