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

Commit de122cb1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Ulf Hansson
Browse files

mmc: tmio: remove TMIO_MMC_HAVE_CTL_DMA_REG flag 



tmio_mmc_host has .enable_dma callback now.
We don't need TMIO_MMC_HAVE_CTL_DMA_REG anymore.
Let's remove it

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f45394d5

drivers/mmc/host/sh_mobile_sdhi.c

+0 −5
Original line number Diff line number Diff line
@@ -291,11 +291,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
	 */

	mmc_data->flags |= TMIO_MMC_SDIO_STATUS_QUIRK;



	/*

	 * All SDHI have DMA control register

	 */

	mmc_data->flags |= TMIO_MMC_HAVE_CTL_DMA_REG;



	if (of_id && of_id->data) {

		const struct sh_mobile_sdhi_of_data *of_data = of_id->data;

		mmc_data->flags |= of_data->tmio_flags;

drivers/mmc/host/tmio_mmc_dma.c

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable) 
	if (!host->chan_tx || !host->chan_rx)

		return;



	if (host->pdata->flags & TMIO_MMC_HAVE_CTL_DMA_REG)

		sd_ctrl_write16(host, CTL_DMA_ENABLE, enable ? 2 : 0);



	if (host->dma->enable)

		host->dma->enable(host, enable);

}

include/linux/mfd/tmio.h

+0 −5
Original line number Diff line number Diff line
@@ -95,11 +95,6 @@ 
 */

#define TMIO_MMC_SDIO_STATUS_QUIRK	(1 << 8)



/*

 * Some controllers have DMA enable/disable register

 */

#define TMIO_MMC_HAVE_CTL_DMA_REG	(1 << 9)



/*

 * Some controllers allows to set SDx actual clock

 */