All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP
@ 2012-07-05  1:12 Ming Lei
  2012-07-10  3:13 ` Chris Ball
  2012-07-19  5:05 ` Chris Ball
  0 siblings, 2 replies; 5+ messages in thread
From: Ming Lei @ 2012-07-05  1:12 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-mmc, Ming Lei

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
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP
  2012-07-05  1:12 [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP Ming Lei
@ 2012-07-10  3:13 ` Chris Ball
  2012-07-19  5:05 ` Chris Ball
  1 sibling, 0 replies; 5+ messages in thread
From: Chris Ball @ 2012-07-10  3:13 UTC (permalink / raw)
  To: Ming Lei; +Cc: linux-mmc

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   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP
  2012-07-05  1:12 [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP Ming Lei
  2012-07-10  3:13 ` Chris Ball
@ 2012-07-19  5:05 ` Chris Ball
  2012-07-19 11:29   ` S, Venkatraman
  1 sibling, 1 reply; 5+ messages in thread
From: Chris Ball @ 2012-07-19  5:05 UTC (permalink / raw)
  To: Venkatraman S, Ming Lei; +Cc: linux-mmc

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.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP
  2012-07-19  5:05 ` Chris Ball
@ 2012-07-19 11:29   ` S, Venkatraman
  2012-07-19 14:41     ` Chris Ball
  0 siblings, 1 reply; 5+ messages in thread
From: S, Venkatraman @ 2012-07-19 11:29 UTC (permalink / raw)
  To: Chris Ball, Ming Lei, Kevin Hilman, Javier Martinez Canillas,
	Tony Lindgren
  Cc: linux-mmc, linux-omap

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
>

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP
  2012-07-19 11:29   ` S, Venkatraman
@ 2012-07-19 14:41     ` Chris Ball
  0 siblings, 0 replies; 5+ messages in thread
From: Chris Ball @ 2012-07-19 14:41 UTC (permalink / raw)
  To: S, Venkatraman
  Cc: Ming Lei, Kevin Hilman, Javier Martinez Canillas, Tony Lindgren,
	linux-mmc, linux-omap

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.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-07-19 14:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-05  1:12 [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP Ming Lei
2012-07-10  3:13 ` Chris Ball
2012-07-19  5:05 ` Chris Ball
2012-07-19 11:29   ` S, Venkatraman
2012-07-19 14:41     ` Chris Ball

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.