diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-02 07:12:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-02 07:12:28 -0500 |
| commit | cdccb39e37ba5b43dcae4e783c15f0471acf5529 (patch) | |
| tree | dbd895067824be9bfa258710e4869d3573314b88 /drivers/core | |
| parent | fc47dbb26e9d86a688e69e198b2ed0749db16756 (diff) | |
| parent | 6d99f866952bb5df7fe699b3db29a97d75e5c445 (diff) | |
Merge branch '2021-12-01-assorted-updates' into next
- Have SPL skip length 0 images, some clean-ups related to CONFIG
symbols and the known list of unmigrated symbols and pinctrl updates.
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index aed093c2af..74374ff881 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -533,8 +533,12 @@ int device_probe(struct udevice *dev) * is set just above. However, the PCI bus' probe() method and * associated uclass methods have not yet been called. */ - if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL) - pinctrl_select_state(dev, "default"); + if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL) { + ret = pinctrl_select_state(dev, "default"); + if (ret && ret != -ENOSYS) + log_debug("Device '%s' failed to configure default pinctrl: %d (%s)\n", + dev->name, ret, errno_str(ret)); + } if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent && (device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) && @@ -586,8 +590,12 @@ int device_probe(struct udevice *dev) if (ret) goto fail_uclass; - if (dev->parent && device_get_uclass_id(dev) == UCLASS_PINCTRL) - pinctrl_select_state(dev, "default"); + if (dev->parent && device_get_uclass_id(dev) == UCLASS_PINCTRL) { + ret = pinctrl_select_state(dev, "default"); + if (ret && ret != -ENOSYS) + log_debug("Device '%s' failed to configure default pinctrl: %d (%s)\n", + dev->name, ret, errno_str(ret)); + } return 0; fail_uclass: |