[PATCH] mmc: sdhi: Enable the driver on all ARM platforms

[Laurent Pinchart]

The subject line should have read 'PATCH v3', my bad.

On Wednesday 30 October 2013 12:23:10 Laurent Pinchart wrote:
> Renesas ARM platforms are transitioning from single-platform to
> multi-platform kernels using the new ARCH_SHMOBILE_MULTI. Make the
> driver available on all ARM platforms to enable it on both ARCH_SHMOBILE
> and ARCH_SHMOBILE_MULTI and increase build testing coverage.
> 
> Don't enable COMPILE_TEST support as the driver doesn't compile on x86
> due (possibly among others) to missing readsw/writesw I/O accessors.
> 
> Whether the CTL_DMA_ENABLE register is part of the standard TMIO
> controller or is Renesas-specific is unknown and impossible to test as
> we have no current or planned TMIO DMA users other than SUPERH and
> ARCH_SHMOBILE. Writing to the register is thus conditionally compiled
> for SUPERH and ARCH_SHMOBILE only. Adding ARCH_SHMOBILE_MULTI to the
> list would extend this to multiarch kernels, but would break the driver
> for non-shmobile platforms if the register is Renesas-specific. We can
> thus get rid of the conditional compilation completely without
> introducing any further issue, and let future non-Renesas users deal
> with the situation if it turns out to be a the problem.
> 
> Cc: Chris Ball <cjb at laptop.org>
> Cc: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
> Cc: Ian Molton <ian at mnementh.co.uk>
> Cc: linux-mmc at vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
> ---
>  drivers/mmc/host/Kconfig        | 2 +-
>  drivers/mmc/host/tmio_mmc_dma.c | 4 +---
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 7fc5099..51957d4 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -479,7 +479,7 @@ config MMC_TMIO
> 
>  config MMC_SDHI
>  	tristate "SH-Mobile SDHI SD/SDIO controller support"
> -	depends on SUPERH || ARCH_SHMOBILE
> +	depends on SUPERH || ARM
>  	select MMC_TMIO_CORE
>  	help
>  	  This provides support for the SDHI SD/SDIO controller found in
> diff --git a/drivers/mmc/host/tmio_mmc_dma.c
> b/drivers/mmc/host/tmio_mmc_dma.c index 65edb4a..8a4fd2d 100644
> --- a/drivers/mmc/host/tmio_mmc_dma.c
> +++ b/drivers/mmc/host/tmio_mmc_dma.c
> @@ -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? */
> +	/* Switch DMA mode on or off. This might be Renesas-specific. */
>  	sd_ctrl_write16(host, CTL_DMA_ENABLE, enable ? 2 : 0);
> -#endif
>  }
> 
>  void tmio_mmc_abort_dma(struct tmio_mmc_host *host)
-- 
Regards,

Laurent Pinchart