Re: [PATCH 32/32] ARM: OMAP: RX51: set MMC capabilities and power-savingflag

[Adrian Hunter]

Matt Fleming wrote:
> On Fri, Jul 10, 2009 at 03:43:53PM +0300, Adrian Hunter wrote:
> > >From 3865867159f25cf706480236f6d4f0e4adde5dac Mon Sep 17 00:00:00 2001
> > From: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> > Date: Fri, 10 Jul 2009 10:32:44 +0300
> > Subject: [PATCH] ARM: OMAP: RX51: set MMC capabilities and power-saving flag
> >
> > Specify MMC capabilities and set the power-saving flag
> > for RX51.
>
> After the changes to [PATCH 7/32], this becomes,

I think this will leave every other board that uses omap_hsmmc
without any card caps.

What about adding something like this:


diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 8900bae..f2548f1 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1720,6 +1720,11 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
		mmc->caps |= MMC_CAP_4_BIT_DATA;

	mmc->caps |= mmc_slot(host).caps;
+	/* If no card caps specified then assume them all */
+	if (!((mmc->caps & MMC_CAP_SD) ||
+	      (mmc->caps & MMC_CAP_MMC) ||
+	      (mmc->caps & MMC_CAP_SDIO)))
+		mmc->caps |= MMC_CAP_SD & MMC_CAP_MMC & MMC_CAP_SDIO;

	omap_hsmmc_conf_bus_power(host);







> ---
>
> ARM: OMAP: RX51: set MMC capabilities and power-saving flag
>
> Specify MMC capabilities and set the power-saving flag for RX51.
>
> Signed-off-by: Matt Fleming <matt@xxxxxxxxxxxxxxxxx>
> Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> Cc: Ian Molton <ian@xxxxxxxxxxxxxx>
> Cc: "Roberto A. Foglietta" <roberto.foglietta@xxxxxxxxx>
> Cc: Jarkko Lavinen <jarkko.lavinen@xxxxxxxxx>
> Cc: Denis Karpov <ext-denis.2.karpov@xxxxxxxxx>
> Cc: Pierre Ossman <pierre@xxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> ---
>  arch/arm/mach-omap2/board-rx51-peripherals.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
> index 9a0bf67..d2ce938 100644
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@ -19,6 +19,7 @@
>  #include <linux/delay.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/gpio.h>
> +#include <linux/mmc/host.h>
>  
>  #include <mach/mcspi.h>
>  #include <mach/mux.h>
> @@ -102,6 +103,8 @@ static struct twl4030_hsmmc_info mmc[] = {
>  		.cover_only	= true,
>  		.gpio_cd	= 160,
>  		.gpio_wp	= -EINVAL,
> +		.power_saving	= true,
> +		.caps		= MMC_CAP_SD,
>  	},
>  	{
>  		.name		= "internal",
> @@ -109,6 +112,8 @@ static struct twl4030_hsmmc_info mmc[] = {
>  		.wires		= 8,
>  		.gpio_cd	= -EINVAL,
>  		.gpio_wp	= -EINVAL,
> +		.power_saving	= true,
> +		.caps		= MMC_CAP_MMC | MMC_CAP_NONREMOVABLE,
>  	},
>  	{}	/* Terminator */
>  };

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/