Skip to content

Commit

Permalink
mmc: dw_mmc: add reset support to dwmmc host controller
Browse files Browse the repository at this point in the history
Dwmmc host controller may in unknown state when entering kernel boot. One
example is when booting from eMMC, bootloader need initialize MMC host
controller into some state so it can read. In order to make sure MMC host
controller in a clean initial state, this reset support is added.

With this patch, a 'resets' property can be added into dw_mmc device
tree node. The hardware logic is: dwmmc host controller IP receives a reset
signal from a 'reset provider' (eg. power management unit). The 'resets'
property points to this reset signal. So, during dwmmc driver probe,
it can use this signal to reset itself.

Refer to [1] for more information.

[1] Documentation/devicetree/bindings/reset/reset.txt

Signed-off-by: Guodong Xu <[email protected]>
Signed-off-by: Xinwei Kong <[email protected]>
Signed-off-by: Zhangfei Gao <[email protected]>
Reviewed-by: Shawn Lin <[email protected]>
Signed-off-by: Jaehoon Chung <[email protected]>
Signed-off-by: Ulf Hansson <[email protected]>
  • Loading branch information
docularxu authored and storulf committed Sep 26, 2016
1 parent fdc22b6 commit d6786fe
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
23 changes: 22 additions & 1 deletion drivers/mmc/host/dw_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2876,6 +2876,13 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
if (!pdata)
return ERR_PTR(-ENOMEM);

/* find reset controller when exist */
pdata->rstc = devm_reset_control_get_optional(dev, NULL);
if (IS_ERR(pdata->rstc)) {
if (PTR_ERR(pdata->rstc) == -EPROBE_DEFER)
return ERR_PTR(-EPROBE_DEFER);
}

/* find out number of slots supported */
of_property_read_u32(np, "num-slots", &pdata->num_slots);

Expand Down Expand Up @@ -2947,7 +2954,9 @@ int dw_mci_probe(struct dw_mci *host)

if (!host->pdata) {
host->pdata = dw_mci_parse_dt(host);
if (IS_ERR(host->pdata)) {
if (PTR_ERR(host->pdata) == -EPROBE_DEFER) {
return -EPROBE_DEFER;
} else if (IS_ERR(host->pdata)) {
dev_err(host->dev, "platform data not available\n");
return -EINVAL;
}
Expand Down Expand Up @@ -3001,6 +3010,12 @@ 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);

Expand Down Expand Up @@ -3150,6 +3165,9 @@ int dw_mci_probe(struct dw_mci *host)
if (host->use_dma && host->dma_ops->exit)
host->dma_ops->exit(host);

if (!IS_ERR(host->pdata->rstc))
reset_control_assert(host->pdata->rstc);

err_clk_ciu:
clk_disable_unprepare(host->ciu_clk);

Expand Down Expand Up @@ -3180,6 +3198,9 @@ void dw_mci_remove(struct dw_mci *host)
if (host->use_dma && host->dma_ops->exit)
host->dma_ops->exit(host);

if (!IS_ERR(host->pdata->rstc))
reset_control_assert(host->pdata->rstc);

clk_disable_unprepare(host->ciu_clk);
clk_disable_unprepare(host->biu_clk);
}
Expand Down
2 changes: 2 additions & 0 deletions include/linux/mmc/dw_mmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <linux/scatterlist.h>
#include <linux/mmc/core.h>
#include <linux/dmaengine.h>
#include <linux/reset.h>

#define MAX_MCI_SLOTS 2

Expand Down Expand Up @@ -259,6 +260,7 @@ struct dw_mci_board {
/* delay in mS before detecting cards after interrupt */
u32 detect_delay_ms;

struct reset_control *rstc;
struct dw_mci_dma_ops *dma_ops;
struct dma_pdata *data;
};
Expand Down

0 comments on commit d6786fe

Please sign in to comment.