From: Simon Glass Date: Fri, 22 Jan 2016 02:43:25 +0000 (-0700) Subject: dm: core: Don't set pinctrl for pinctrl devices X-Git-Tag: v2016.03-rc1~235 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0379597e55c17519be36fdf357d4463279da5aca;p=u-boot dm: core: Don't set pinctrl for pinctrl devices There is sort-of race condition when a pinctrl device is probed. The pinctrl function is called which may end up using the same device as is being probed. This results in operations being used before the device is actually probed. For now, disallow pinctrl operations on pinctrl devices while probing. An alternative solution would be to move the operation to later in the device_probe() function (for pinctrl devices only) but this needs more thought. Signed-off-by: Simon Glass --- diff --git a/drivers/core/device.c b/drivers/core/device.c index 1e5584a7ce..f5def35b5b 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -299,9 +299,11 @@ int device_probe_child(struct udevice *dev, void *parent_priv) /* * Process pinctrl for everything except the root device, and - * continue regardless of the result of pinctrl. + * continue regardless of the result of pinctrl. Don't process pinctrl + * settings for pinctrl devices since the device may not yet be + * probed. */ - if (dev->parent) + if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL) pinctrl_select_state(dev, "default"); ret = uclass_pre_probe_device(dev);