[PATCH] omap4: mmc: Fix the regulator resource for MMC2

[PATCH] omap4: mmc: Fix the regulator resource for MMC2

[Santosh Shilimkar]

The MMC1 and MMC2 cards have seperate LDO supplies. Current code assumes
that they are powered by same LDO.

This patch fixes the same and has VAUX1 as supply to MMC2 card.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Tested-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
Tested with omap3_defconfig on OMAP4430SDP

 arch/arm/mach-omap2/board-4430sdp.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 7a78986..f62042e 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -384,14 +384,16 @@ static struct omap2_hsmmc_info mmc[] = {
 	{}	/* Terminator */
 };
 
-static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
+static struct regulator_consumer_supply sdp4430_vaux_supply[] = {
 	{
 		.supply = "vmmc",
-		.dev_name = "mmci-omap-hs.0",
+		.dev_name = "mmci-omap-hs.1",
 	},
+};
+static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
 	{
 		.supply = "vmmc",
-		.dev_name = "mmci-omap-hs.1",
+		.dev_name = "mmci-omap-hs.0",
 	},
 };
 
@@ -447,6 +449,8 @@ static struct regulator_init_data sdp4430_vaux1 = {
 					| REGULATOR_CHANGE_MODE
 					| REGULATOR_CHANGE_STATUS,
 	},
+	.num_consumer_supplies  = 1,
+	.consumer_supplies      = sdp4430_vaux_supply,
 };
 
 static struct regulator_init_data sdp4430_vaux2 = {
@@ -487,7 +491,7 @@ static struct regulator_init_data sdp4430_vmmc = {
 					| REGULATOR_CHANGE_MODE
 					| REGULATOR_CHANGE_STATUS,
 	},
-	.num_consumer_supplies  = 2,
+	.num_consumer_supplies  = 1,
 	.consumer_supplies      = sdp4430_vmmc_supply,
 };
 
-- 
1.6.0.4

RE: [PATCH] omap4: mmc: Fix the regulator resource for MMC2

[Shilimkar, Santosh]

Tony,
> -----Original Message-----
> From: Shilimkar, Santosh
> Sent: Friday, May 28, 2010 9:38 PM
> To: linux-omap@vger.kernel.org
> Cc: Shilimkar, Santosh; Nayak, Rajendra; Ghorai, Sukumar; Kadiyala, Kishore
> Subject: [PATCH] omap4: mmc: Fix the regulator resource for MMC2
> 
> The MMC1 and MMC2 cards have seperate LDO supplies. Current code assumes
> that they are powered by same LDO.
> 
> This patch fixes the same and has VAUX1 as supply to MMC2 card.
> 
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> Tested-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> Tested with omap3_defconfig on OMAP4430SDP
> 
Any comments on this one ??

>  arch/arm/mach-omap2/board-4430sdp.c |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index 7a78986..f62042e 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -384,14 +384,16 @@ static struct omap2_hsmmc_info mmc[] = {
>  	{}	/* Terminator */
>  };
> 
> -static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
> +static struct regulator_consumer_supply sdp4430_vaux_supply[] = {
>  	{
>  		.supply = "vmmc",
> -		.dev_name = "mmci-omap-hs.0",
> +		.dev_name = "mmci-omap-hs.1",
>  	},
> +};
> +static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
>  	{
>  		.supply = "vmmc",
> -		.dev_name = "mmci-omap-hs.1",
> +		.dev_name = "mmci-omap-hs.0",
>  	},
>  };
> 
> @@ -447,6 +449,8 @@ static struct regulator_init_data sdp4430_vaux1 = {
>  					| REGULATOR_CHANGE_MODE
>  					| REGULATOR_CHANGE_STATUS,
>  	},
> +	.num_consumer_supplies  = 1,
> +	.consumer_supplies      = sdp4430_vaux_supply,
>  };
> 
>  static struct regulator_init_data sdp4430_vaux2 = {
> @@ -487,7 +491,7 @@ static struct regulator_init_data sdp4430_vmmc = {
>  					| REGULATOR_CHANGE_MODE
>  					| REGULATOR_CHANGE_STATUS,
>  	},
> -	.num_consumer_supplies  = 2,
> +	.num_consumer_supplies  = 1,
>  	.consumer_supplies      = sdp4430_vmmc_supply,
>  };
> 
> --
> 1.6.0.4

RE: [PATCH] omap4: mmc: Fix the regulator resource for MMC2

[Shilimkar, Santosh]

ping 
> -----Original Message-----
> From: Shilimkar, Santosh
> Sent: Thursday, June 10, 2010 9:05 PM
> To: Shilimkar, Santosh; linux-omap@vger.kernel.org
> Cc: Nayak, Rajendra; Ghorai, Sukumar; Kadiyala, Kishore
> Subject: RE: [PATCH] omap4: mmc: Fix the regulator resource for MMC2
> 
> Tony,
> > -----Original Message-----
> > From: Shilimkar, Santosh
> > Sent: Friday, May 28, 2010 9:38 PM
> > To: linux-omap@vger.kernel.org
> > Cc: Shilimkar, Santosh; Nayak, Rajendra; Ghorai, Sukumar; Kadiyala,
> Kishore
> > Subject: [PATCH] omap4: mmc: Fix the regulator resource for MMC2
> >
> > The MMC1 and MMC2 cards have seperate LDO supplies. Current code assumes
> > that they are powered by same LDO.
> >
> > This patch fixes the same and has VAUX1 as supply to MMC2 card.
> >
> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> > Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
> > Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> > Tested-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > ---
> > Tested with omap3_defconfig on OMAP4430SDP
> >
> Any comments on this one ??
> 
> >  arch/arm/mach-omap2/board-4430sdp.c |   12 ++++++++----
> >  1 files changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-
> omap2/board-4430sdp.c
> > index 7a78986..f62042e 100644
> > --- a/arch/arm/mach-omap2/board-4430sdp.c
> > +++ b/arch/arm/mach-omap2/board-4430sdp.c
> > @@ -384,14 +384,16 @@ static struct omap2_hsmmc_info mmc[] = {
> >  	{}	/* Terminator */
> >  };
> >
> > -static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
> > +static struct regulator_consumer_supply sdp4430_vaux_supply[] = {
> >  	{
> >  		.supply = "vmmc",
> > -		.dev_name = "mmci-omap-hs.0",
> > +		.dev_name = "mmci-omap-hs.1",
> >  	},
> > +};
> > +static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
> >  	{
> >  		.supply = "vmmc",
> > -		.dev_name = "mmci-omap-hs.1",
> > +		.dev_name = "mmci-omap-hs.0",
> >  	},
> >  };
> >
> > @@ -447,6 +449,8 @@ static struct regulator_init_data sdp4430_vaux1 = {
> >  					| REGULATOR_CHANGE_MODE
> >  					| REGULATOR_CHANGE_STATUS,
> >  	},
> > +	.num_consumer_supplies  = 1,
> > +	.consumer_supplies      = sdp4430_vaux_supply,
> >  };
> >
> >  static struct regulator_init_data sdp4430_vaux2 = {
> > @@ -487,7 +491,7 @@ static struct regulator_init_data sdp4430_vmmc = {
> >  					| REGULATOR_CHANGE_MODE
> >  					| REGULATOR_CHANGE_STATUS,
> >  	},
> > -	.num_consumer_supplies  = 2,
> > +	.num_consumer_supplies  = 1,
> >  	.consumer_supplies      = sdp4430_vmmc_supply,
> >  };
> >
> > --
> > 1.6.0.4

[APPLIED] [PATCH] omap4: mmc: Fix the regulator resource for MMC2

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: devel-boards

Initial commit ID (Likely to change): 4b78f83d08ecac0c9b7aa1ee72345be4657abcb9

PatchWorks
http://patchwork.kernel.org/patch/102918/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=4b78f83d08ecac0c9b7aa1ee72345be4657abcb9