diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2021-03-03 14:06:28 +0000 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2021-03-11 09:22:25 +0000 |
| commit | 361695c439f8f071850bf1058876047a42b9195f (patch) | |
| tree | 71efcadebdd0cbb6f97aae43249be8853e7ba45a | |
| parent | f878646ff0863b0b2dac27b4011023729cc17686 (diff) | |
soundwire: qcom: wait for enumeration to be complete in probe
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
| -rw-r--r-- | drivers/soundwire/qcom.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 9f5086527d55d..f52b934a0fc59 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -123,6 +123,7 @@ struct qcom_swrm_ctrl { struct regmap *regmap; void __iomem *mmio; struct completion broadcast; + struct completion enumeration; struct work_struct slave_work; /* Port alloc/free lock */ struct mutex port_lock; @@ -415,6 +416,7 @@ static int qcom_swrm_enumerate(struct sdw_bus *bus) sdw_slave_add(bus, &id, NULL); } + complete(&ctrl->enumeration); return 0; } @@ -1152,6 +1154,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, ctrl); mutex_init(&ctrl->port_lock); init_completion(&ctrl->broadcast); + init_completion(&ctrl->enumeration); ctrl->bus.ops = &qcom_swrm_ops; ctrl->bus.port_ops = &qcom_swrm_port_ops; @@ -1198,6 +1201,8 @@ static int qcom_swrm_probe(struct platform_device *pdev) } qcom_swrm_init(ctrl); + wait_for_completion_timeout(&ctrl->enumeration, + msecs_to_jiffies(TIMEOUT_MS)); ret = qcom_swrm_register_dais(ctrl); if (ret) goto err_master_add; |