diff mbox

MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP

Message ID 1341450721-20993-1-git-send-email-ming.lei@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ming Lei July 5, 2012, 1:12 a.m. UTC
Recent commits on omap mmc/hsmmc in -next tree switch to
DMA_ENGINE entirely, so make MMC_OMAP* depend on DMA_OMAP
and DMA_ENGINE, otherwise OMAP MMC/HSMMC won't work without
enabling DMA_ENGINE and DMA_OMAP.

The patch simply make them depend on DMA_OMAP since DMA_OMAP
will select DMA_ENGINE automatically.

Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
 drivers/mmc/host/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Chris Ball July 10, 2012, 3:13 a.m. UTC | #1
Hi Ming,

On Wed, Jul 04 2012, Ming Lei wrote:
> Recent commits on omap mmc/hsmmc in -next tree switch to
> DMA_ENGINE entirely, so make MMC_OMAP* depend on DMA_OMAP
> and DMA_ENGINE, otherwise OMAP MMC/HSMMC won't work without
> enabling DMA_ENGINE and DMA_OMAP.
>
> The patch simply make them depend on DMA_OMAP since DMA_OMAP
> will select DMA_ENGINE automatically.
>
> Signed-off-by: Ming Lei <ming.lei@canonical.com>
> ---
>  drivers/mmc/host/Kconfig |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index aa131b3..ef72c50 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -231,7 +231,7 @@ config MMC_SDHCI_S3C_DMA
>  
>  config MMC_OMAP
>  	tristate "TI OMAP Multimedia Card Interface support"
> -	depends on ARCH_OMAP
> +	depends on ARCH_OMAP && DMA_OMAP
>  	select TPS65010 if MACH_OMAP_H2
>  	help
>  	  This selects the TI OMAP Multimedia card Interface.
> @@ -242,7 +242,7 @@ config MMC_OMAP
>  
>  config MMC_OMAP_HS
>  	tristate "TI OMAP High Speed Multimedia Card Interface support"
> -	depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
> +	depends on (SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4) && DMA_OMAP
>  	help
>  	  This selects the TI OMAP High Speed Multimedia card Interface.
>  	  If you have an OMAP2430 or OMAP3 board or OMAP4 board with a

Thanks, pushed to mmc-next for 3.6.

- Chris.
Chris Ball July 19, 2012, 5:05 a.m. UTC | #2
Hi Venkat -- please could you ACK/review this patch?

On Wed, Jul 04 2012, Ming Lei wrote:
> Recent commits on omap mmc/hsmmc in -next tree switch to
> DMA_ENGINE entirely, so make MMC_OMAP* depend on DMA_OMAP
> and DMA_ENGINE, otherwise OMAP MMC/HSMMC won't work without
> enabling DMA_ENGINE and DMA_OMAP.
>
> The patch simply make them depend on DMA_OMAP since DMA_OMAP
> will select DMA_ENGINE automatically.
>
> Signed-off-by: Ming Lei <ming.lei@canonical.com>
> ---
>  drivers/mmc/host/Kconfig |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index aa131b3..ef72c50 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -231,7 +231,7 @@ config MMC_SDHCI_S3C_DMA
>  
>  config MMC_OMAP
>  	tristate "TI OMAP Multimedia Card Interface support"
> -	depends on ARCH_OMAP
> +	depends on ARCH_OMAP && DMA_OMAP
>  	select TPS65010 if MACH_OMAP_H2
>  	help
>  	  This selects the TI OMAP Multimedia card Interface.
> @@ -242,7 +242,7 @@ config MMC_OMAP
>  
>  config MMC_OMAP_HS
>  	tristate "TI OMAP High Speed Multimedia Card Interface support"
> -	depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
> +	depends on (SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4) && DMA_OMAP
>  	help
>  	  This selects the TI OMAP High Speed Multimedia card Interface.
>  	  If you have an OMAP2430 or OMAP3 board or OMAP4 board with a

Thanks,

- Chris.
Venkatraman S July 19, 2012, 11:29 a.m. UTC | #3
On Thu, Jul 19, 2012 at 10:35 AM, Chris Ball <cjb@laptop.org> wrote:
> Hi Venkat -- please could you ACK/review this patch?
>

Chris,
 I think we have to hold on to this patch just for today. There's
another thread about this same issue on linux-omap

> On Wed, Jul 04 2012, Ming Lei wrote:
>> Recent commits on omap mmc/hsmmc in -next tree switch to
>> DMA_ENGINE entirely, so make MMC_OMAP* depend on DMA_OMAP
>> and DMA_ENGINE, otherwise OMAP MMC/HSMMC won't work without
>> enabling DMA_ENGINE and DMA_OMAP.
>>
>> The patch simply make them depend on DMA_OMAP since DMA_OMAP
>> will select DMA_ENGINE automatically.
>>
>> Signed-off-by: Ming Lei <ming.lei@canonical.com>
>> ---
>>  drivers/mmc/host/Kconfig |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
>> index aa131b3..ef72c50 100644
>> --- a/drivers/mmc/host/Kconfig
>> +++ b/drivers/mmc/host/Kconfig
>> @@ -231,7 +231,7 @@ config MMC_SDHCI_S3C_DMA
>>
>>  config MMC_OMAP
>>       tristate "TI OMAP Multimedia Card Interface support"
>> -     depends on ARCH_OMAP
>> +     depends on ARCH_OMAP && DMA_OMAP
>>       select TPS65010 if MACH_OMAP_H2
>>       help> Thanks,
>
> - Chris.
> --
> Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> One Laptop Per Child


>>         This selects the TI OMAP Multimedia card Interface.
>> @@ -242,7 +242,7 @@ config MMC_OMAP
>>
>>  config MMC_OMAP_HS
>>       tristate "TI OMAP High Speed Multimedia Card Interface support"
>> -     depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
>> +     depends on (SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4) && DMA_OMAP
>>       help
>>         This selects the TI OMAP High Speed Multimedia card Interface.
>>         If you have an OMAP2430 or OMAP3 board or OMAP4 board with a
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chris Ball July 19, 2012, 2:41 p.m. UTC | #4
Hi,

On Thu, Jul 19 2012, S, Venkatraman wrote:
> Chris,
>  I think we have to hold on to this patch just for today. There's
> another thread about this same issue on linux-omap

Thanks, I've dropped it from mmc-next -- I'll wait for Russell or Tony
to agree with one of the patches.

- Chris.
diff mbox

Patch

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index aa131b3..ef72c50 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -231,7 +231,7 @@  config MMC_SDHCI_S3C_DMA
 
 config MMC_OMAP
 	tristate "TI OMAP Multimedia Card Interface support"
-	depends on ARCH_OMAP
+	depends on ARCH_OMAP && DMA_OMAP
 	select TPS65010 if MACH_OMAP_H2
 	help
 	  This selects the TI OMAP Multimedia card Interface.
@@ -242,7 +242,7 @@  config MMC_OMAP
 
 config MMC_OMAP_HS
 	tristate "TI OMAP High Speed Multimedia Card Interface support"
-	depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
+	depends on (SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4) && DMA_OMAP
 	help
 	  This selects the TI OMAP High Speed Multimedia card Interface.
 	  If you have an OMAP2430 or OMAP3 board or OMAP4 board with a