leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: sh_mobile_sdhi: add a callback for board specific init code

Browse Source 
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>
This commit is contained in:
Bastian Hecht 2012-03-16 12:19:29 -04:00 committed by Chris Ball
parent 4932bd64a2
commit e82b4ac94e
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/host/sh_mobile_sdhi.c
View File

@ -109,6 +109,12 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
mmc_data = &priv->mmc_data; mmc_data = &priv->mmc_data;
p->pdata = 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); snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id);
priv->clk = clk_get(&pdev->dev, clk_name); priv->clk = clk_get(&pdev->dev, clk_name);
if (IS_ERR(priv->clk)) { if (IS_ERR(priv->clk)) {
@ -233,6 +239,9 @@ eirq_card_detect:
eprobe: eprobe:
clk_put(priv->clk); clk_put(priv->clk);
eclkget: eclkget:
if (p->cleanup)
p->cleanup(pdev);
einit:
kfree(priv); kfree(priv);
return ret; return ret;
} }
@ -257,6 +266,10 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev)
} }
clk_put(priv->clk); clk_put(priv->clk);
if (p->cleanup)
p->cleanup(pdev);
kfree(priv); kfree(priv);
return 0; return 0;

4
include/linux/mmc/sh_mobile_sdhi.h
View File

@ -20,6 +20,10 @@ struct sh_mobile_sdhi_info {
struct tmio_mmc_data *pdata; struct tmio_mmc_data *pdata;
void (*set_pwr)(struct platform_device *pdev, int state); void (*set_pwr)(struct platform_device *pdev, int state);
int (*get_cd)(struct platform_device *pdev); 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 */ #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */