diff options
| author |   Bastian Hecht <hechtb@googlemail.com> | 2012-03-16 12:19:29 -0400 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2012-03-27 12:20:19 -0400 |
| commit | e82b4ac94e5c43fad51b975aed058858ceda1f0f (patch) | |
| tree | 40c1f770d227f109c6d11c7b23ef20638beea406 | |
| parent | mmc: tmio: cosmetic: prettify the tmio_mmc_set_ios() function (diff) | |
| download | wireguard-linux-e82b4ac94e5c43fad51b975aed058858ceda1f0f.tar.xz wireguard-linux-e82b4ac94e5c43fad51b975aed058858ceda1f0f.zip | |
mmc: sh_mobile_sdhi: add a callback for board specific init code
Some boards need a preliminary setup stage to prepare the sdhi
controller.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/sh_mobile_sdhi.c | 13 | ||||
| -rw-r--r-- | include/linux/mmc/sh_mobile_sdhi.h | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index f91c3aa40d1d..07ff3fee77b3 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -109,6 +109,12 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) mmc_data = &priv->mmc_data; p->pdata = mmc_data; + if (p->init) { + ret = p->init(pdev); + if (ret) + goto einit; + } + snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id); priv->clk = clk_get(&pdev->dev, clk_name); if (IS_ERR(priv->clk)) { @@ -233,6 +239,9 @@ eirq_card_detect: eprobe: clk_put(priv->clk); eclkget: + if (p->cleanup) + p->cleanup(pdev); +einit: kfree(priv); return ret; } @@ -257,6 +266,10 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) } clk_put(priv->clk); + + if (p->cleanup) + p->cleanup(pdev); + kfree(priv); return 0; diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h index 082a736a9bfb..686b85bfb7a5 100644 --- a/include/linux/mmc/sh_mobile_sdhi.h +++ b/include/linux/mmc/sh_mobile_sdhi.h @@ -20,6 +20,10 @@ struct sh_mobile_sdhi_info { struct tmio_mmc_data *pdata; void (*set_pwr)(struct platform_device *pdev, int state); int (*get_cd)(struct platform_device *pdev); + + /* callbacks for board specific setup code */ + int (*init)(struct platform_device *pdev); + void (*cleanup)(struct platform_device *pdev); }; #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */ |