diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-10-15 15:34:14 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-10-15 15:34:14 +0200 |
| commit | f74dc51bcab924a30e41b33981a4f96af3f9dd57 (patch) | |
| tree | 560eead1ca9984554be3a5c9a5332b531c102cb0 /drivers/core | |
| parent | cf04ad3219260c3c39ec3dbfe2427e3463e8dbd5 (diff) | |
| parent | 297faccca2235e359012118495b9b73451d54bb9 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 0bc04d4876..833a803696 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -289,8 +289,12 @@ int device_probe_child(struct udevice *dev, void *parent_priv) dev->flags |= DM_FLAG_ACTIVATED; - /* continue regardless of the result of pinctrl */ - pinctrl_select_state(dev, "default"); + /* + * Process pinctrl for everything except the root device, and + * continue regardless of the result of pinctrl. + */ + if (dev->parent) + pinctrl_select_state(dev, "default"); ret = uclass_pre_probe_device(dev); if (ret) |