| Message ID | 20170811080624.42173-1-liwei213@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Trim cc On 2017/8/11 16:06, Li Wei wrote: > This commit modifies dw_mci_probe(), it moves reset assertion before > drv_data->init(host) > > Some driver needs to access controller registers in its .init() ops. So, > in order to make such access safe, we should do controller reset before > .init() being called. > LGTM Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> > Signed-off-by: Wei Li <liwei213@huawei.com> > Signed-off-by: Guodong Xu <guodong.xu@linaro.org> > Signed-off-by: Chen Jun <chenjun14@huawei.com> > --- -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index a9dfb26972f2..f2fa928e1a12 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3067,6 +3067,12 @@ int dw_mci_probe(struct dw_mci *host) goto err_clk_ciu; } + if (!IS_ERR(host->pdata->rstc)) { + reset_control_assert(host->pdata->rstc); + usleep_range(10, 50); + reset_control_deassert(host->pdata->rstc); + } + if (drv_data && drv_data->init) { ret = drv_data->init(host); if (ret) { @@ -3076,12 +3082,6 @@ int dw_mci_probe(struct dw_mci *host) } } - if (!IS_ERR(host->pdata->rstc)) { - reset_control_assert(host->pdata->rstc); - usleep_range(10, 50); - reset_control_deassert(host->pdata->rstc); - } - setup_timer(&host->cmd11_timer, dw_mci_cmd11_timer, (unsigned long)host);