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

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

mmc: tmio: remove Renesas specific #ifdef 



This patch adds new TMIO_MMC_HAVE_CTL_DMA_REG flag,
and remove Renesas specific #ifdef from tmio driver

Tested-by: default avatarNguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: default avatarHiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 81e888da

drivers/mmc/host/sh_mobile_sdhi.c

+5 −0
Original line number Diff line number Diff line
@@ -235,6 +235,11 @@ 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

+2 −4
Original line number Diff line number Diff line
@@ -28,10 +28,8 @@ void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable) 
	if (!host->chan_tx || !host->chan_rx)

		return;



#if defined(CONFIG_SUPERH) || defined(CONFIG_ARCH_SHMOBILE)

	/* Switch DMA mode on or off - SuperH specific? */

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

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

#endif

}



void tmio_mmc_abort_dma(struct tmio_mmc_host *host)

include/linux/mfd/tmio.h

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

#define TMIO_MMC_SDIO_STATUS_QUIRK	(1 << 8)



/*

 * Some controllers have DMA enable/disable register

 */

#define TMIO_MMC_HAVE_CTL_DMA_REG	(1 << 9)



int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);

int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);

void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);