Commit 87e985ae authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: enable WAIT_WHILE_BUSY 



Now that we got the timeout handling in the driver correct, we can use
this capability to avoid polling via the MMC core.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20210409094606.4317-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5ec6fa5a

drivers/mmc/host/renesas_sdhi_internal_dmac.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static const struct renesas_sdhi_of_data of_rza2_compatible = { 
			  TMIO_MMC_HAVE_CBSY,

	.tmio_ocr_mask	= MMC_VDD_32_33,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_CMD23,

			  MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,

	.bus_shift	= 2,

	.scc_offset	= 0 - 0x1000,

	.taps		= rcar_gen3_scc_taps,
@@ -111,7 +111,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = { 
	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |

			  TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_CMD23,

			  MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,

	.capabilities2	= MMC_CAP2_NO_WRITE_PROTECT | MMC_CAP2_MERGE_CAPABLE,

	.bus_shift	= 2,

	.scc_offset	= 0x1000,

drivers/mmc/host/renesas_sdhi_sys_dmac.c

+5 −3
Original line number Diff line number Diff line
@@ -33,12 +33,14 @@ static const struct renesas_sdhi_of_data of_rz_compatible = { 
	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_32BIT_DATA_PORT |

			  TMIO_MMC_HAVE_CBSY,

	.tmio_ocr_mask	= MMC_VDD_32_33,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_WAIT_WHILE_BUSY,

};



static const struct renesas_sdhi_of_data of_rcar_gen1_compatible = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_WAIT_WHILE_BUSY,

	.capabilities2	= MMC_CAP2_NO_WRITE_PROTECT,

};
@@ -58,7 +60,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen2_compatible = { 
	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |

			  TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_CMD23,

			  MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY,

	.capabilities2	= MMC_CAP2_NO_WRITE_PROTECT,

	.dma_buswidth	= DMA_SLAVE_BUSWIDTH_4_BYTES,

	.dma_rx_offset	= 0x2000,