Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82b4ac9 authored by Bastian Hecht's avatar Bastian Hecht Committed by Chris Ball
Browse files

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: default avatarBastian Hecht <hechtb@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 4932bd64

drivers/mmc/host/sh_mobile_sdhi.c

+13 −0
Original line number Diff line number Diff line
@@ -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;

include/linux/mmc/sh_mobile_sdhi.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */