Skip to content

Commit

Permalink
mmc: sh_mobile_sdhi: add a callback for board specific init code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bastian Hecht authored and Chris Ball committed Mar 27, 2012
1 parent 4932bd6 commit e82b4ac
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
13 changes: 13 additions & 0 deletions drivers/mmc/host/sh_mobile_sdhi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -233,6 +239,9 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
eprobe:
clk_put(priv->clk);
eclkget:
if (p->cleanup)
p->cleanup(pdev);
einit:
kfree(priv);
return ret;
}
Expand All @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions include/linux/mmc/sh_mobile_sdhi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit e82b4ac

Please sign in to comment.