diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-08 03:03:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-08 03:03:41 -0400 |
| commit | 739c5e08335b15ac7c55c98ada32eb97ba508a5f (patch) | |
| tree | 03c31998bab2b2ab653829e84a2560bbe04e007f /drivers | |
| parent | b1f492ca9e0c090209824ff36456d4f131843190 (diff) | |
| parent | 7bb91dd109e2aff5f7f51aed44ac7890f9a4d158 (diff) | |
| download | talos-obmc-uboot-739c5e08335b15ac7c55c98ada32eb97ba508a5f.tar.gz talos-obmc-uboot-739c5e08335b15ac7c55c98ada32eb97ba508a5f.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/core/device.c | 8 | ||||
| -rw-r--r-- | drivers/misc/reset_sandbox.c | 2 |
2 files changed, 7 insertions, 3 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) diff --git a/drivers/misc/reset_sandbox.c b/drivers/misc/reset_sandbox.c index 917121bc5e..2691bb031a 100644 --- a/drivers/misc/reset_sandbox.c +++ b/drivers/misc/reset_sandbox.c @@ -40,7 +40,7 @@ static int sandbox_reset_request(struct udevice *dev, enum reset_t type) * (see the U_BOOT_DEVICE() declaration below) should not do anything. * If we are that device, return an error. */ - if (gd->fdt_blob && dev->of_offset == -1) + if (state->fdt_fname && dev->of_offset == -1) return -ENODEV; switch (type) { |
