diff mbox

[5/6] RX51: adjust hsmmc info

Message ID 20090310093329.16889.76098.sendpatchset@ahunter-laptop (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Adrian Hunter March 10, 2009, 9:33 a.m. UTC 
From 6c1c8a4fa8b60ba777d878b7c4e2941826914a7c Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Fri, 23 Jan 2009 11:54:13 +0200
Subject: [PATCH] RX51: adjust hsmmc info

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
---
 arch/arm/mach-omap2/board-rx51-flash.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Comments

David Brownell March 10, 2009, 5:58 p.m. UTC | #1 
On Tuesday 10 March 2009, Adrian Hunter wrote:
> @@ -52,16 +52,20 @@ static struct platform_device *rx51_flash_devices[] = {
>  
>  static struct twl4030_hsmmc_info mmc[] __initdata = {
>         {
> +               .name           = "external",
>                 .mmc            = 1,
> -               .wires          = 8,
> +               .wires          = 4,
> +               .cover_only     = true,
>                 .gpio_cd        = 160,
>                 .gpio_wp        = -EINVAL,
>         },
>         {
> +               .name           = "internal",
>                 .mmc            = 2,
>                 .wires          = 8,

Ack on all the changes above ...


>                 .gpio_cd        = -EINVAL,
>                 .gpio_wp        = -EINVAL,
> +               .vsim_18v       = true,

... but not that one.

>         },
>         {}      /* Terminator */
>  };


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren March 10, 2009, 7:30 p.m. UTC | #2 
* David Brownell <david-b@pacbell.net> [090310 10:58]:
> On Tuesday 10 March 2009, Adrian Hunter wrote:
> > @@ -52,16 +52,20 @@ static struct platform_device *rx51_flash_devices[] = {
> >  
> >  static struct twl4030_hsmmc_info mmc[] __initdata = {
> >         {
> > +               .name           = "external",
> >                 .mmc            = 1,
> > -               .wires          = 8,
> > +               .wires          = 4,
> > +               .cover_only     = true,
> >                 .gpio_cd        = 160,
> >                 .gpio_wp        = -EINVAL,
> >         },
> >         {
> > +               .name           = "internal",
> >                 .mmc            = 2,
> >                 .wires          = 8,
> 
> Ack on all the changes above ...
> 
> 
> >                 .gpio_cd        = -EINVAL,
> >                 .gpio_wp        = -EINVAL,
> > +               .vsim_18v       = true,
> 
> ... but not that one.
> 
> >         },
> >         {}      /* Terminator */
> >  };
> 
> 

Applied this too except for the vsim_18v.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-rx51-flash.c b/arch/arm/mach-omap2/board-rx51-flash.c
index 7af0d46..20fe242 100644
--- a/arch/arm/mach-omap2/board-rx51-flash.c
+++ b/arch/arm/mach-omap2/board-rx51-flash.c
@@ -52,16 +52,20 @@  static struct platform_device *rx51_flash_devices[] = {
 
 static struct twl4030_hsmmc_info mmc[] __initdata = {
 	{
+		.name		= "external",
 		.mmc		= 1,
-		.wires		= 8,
+		.wires		= 4,
+		.cover_only	= true,
 		.gpio_cd	= 160,
 		.gpio_wp	= -EINVAL,
 	},
 	{
+		.name		= "internal",
 		.mmc		= 2,
 		.wires		= 8,
 		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
+		.vsim_18v	= true,
 	},
 	{}	/* Terminator */
 };