Commit 9d731e75 authored by Chris Ball's avatar Chris Ball
Browse files

Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data" 

This reverts commit 3af9d15c, which
causes a build failure:

drivers/mfd/asic3.c:724:2: error: unknown field 'set_pwr' specified in initializer
parent b7d06c85

drivers/mmc/host/tmio_mmc.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct tmio_mmc_host { 
	enum tmio_mmc_power	power;



	/* Callbacks for clock / power control */

	void (*set_pwr)(struct platform_device *host, int state);

	void (*set_clk_div)(struct platform_device *host, int state);



	/* pio related stuff */

drivers/mmc/host/tmio_mmc_pio.c

+7 −0
Original line number Diff line number Diff line
@@ -777,6 +777,9 @@ static void tmio_mmc_power_on(struct tmio_mmc_host *host, unsigned short vdd) 


	/* .set_ios() is returning void, so, no chance to report an error */



	if (host->set_pwr)

		host->set_pwr(host->pdev, 1);



	if (!IS_ERR(mmc->supply.vmmc)) {

		ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		/*
@@ -810,6 +813,9 @@ static void tmio_mmc_power_off(struct tmio_mmc_host *host) 


	if (!IS_ERR(mmc->supply.vmmc))

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);



	if (host->set_pwr)

		host->set_pwr(host->pdev, 0);

}



/* Set MMC clock / power.
@@ -996,6 +1002,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host, 
	_host->pdev = pdev;

	platform_set_drvdata(pdev, mmc);



	_host->set_pwr = pdata->set_pwr;

	_host->set_clk_div = pdata->set_clk_div;



	/* SD control register space size is 0x200, 0x400 for bus_shift=1 */

include/linux/mfd/tmio.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ struct tmio_mmc_data { 
	struct tmio_mmc_dma		*dma;

	struct device			*dev;

	unsigned int			cd_gpio;

	void (*set_pwr)(struct platform_device *host, int state);

	void (*set_clk_div)(struct platform_device *host, int state);

	int (*write16_hook)(struct tmio_mmc_host *host, int addr);

	/* clock management callbacks */