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

Commit 6a4679f3 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: host: sh_mobile_sdhi: move card_busy from tmio to sdhi 



card_busy is only used/tested on SDHI for R-Car Gen2 and later.
Move it to the SDHI driver, so we can then activate it conditionally
depending on the SDHI type.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2dd110b2

drivers/mmc/host/sh_mobile_sdhi.c

+8 −0
Original line number Diff line number Diff line
@@ -213,6 +213,13 @@ static void sh_mobile_sdhi_clk_disable(struct tmio_mmc_host *host) 
	clk_disable_unprepare(priv->clk);

}



static int sh_mobile_sdhi_card_busy(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);



	return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_DAT0);

}



static int sh_mobile_sdhi_start_signal_voltage_switch(struct mmc_host *mmc,

						      struct mmc_ios *ios)

{
@@ -369,6 +376,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
	host->clk_update	= sh_mobile_sdhi_clk_update;

	host->clk_disable	= sh_mobile_sdhi_clk_disable;

	host->multi_io_quirk	= sh_mobile_sdhi_multi_io_quirk;

	host->card_busy	= sh_mobile_sdhi_card_busy;

	host->start_signal_voltage_switch = sh_mobile_sdhi_start_signal_voltage_switch;



	/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */

drivers/mmc/host/tmio_mmc.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ struct tmio_mmc_host { 
	void (*clk_disable)(struct tmio_mmc_host *host);

	int (*multi_io_quirk)(struct mmc_card *card,

			      unsigned int direction, int blk_size);

	int (*card_busy)(struct mmc_host *mmc);

	int (*start_signal_voltage_switch)(struct mmc_host *mmc,

					   struct mmc_ios *ios);

};

drivers/mmc/host/tmio_mmc_pio.c

+1 −8
Original line number Diff line number Diff line
@@ -960,20 +960,12 @@ static int tmio_multi_io_quirk(struct mmc_card *card, 
	return blk_size;

}



static int tmio_mmc_card_busy(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);



	return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_DAT0);

}



static struct mmc_host_ops tmio_mmc_ops = {

	.request	= tmio_mmc_request,

	.set_ios	= tmio_mmc_set_ios,

	.get_ro         = tmio_mmc_get_ro,

	.get_cd		= mmc_gpio_get_cd,

	.enable_sdio_irq = tmio_mmc_enable_sdio_irq,

	.card_busy	= tmio_mmc_card_busy,

	.multi_io_quirk	= tmio_multi_io_quirk,

};
@@ -1072,6 +1064,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, 
		goto host_free;

	}



	tmio_mmc_ops.card_busy = _host->card_busy;

	tmio_mmc_ops.start_signal_voltage_switch = _host->start_signal_voltage_switch;

	mmc->ops = &tmio_mmc_ops;