[PATCH] musb: fix power field to hold all possible values

[PATCH] musb: fix power field to hold all possible values

[Ajay Kumar Gupta]

MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus
the 'power' field has to hold values above 255.


Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
---
 arch/arm/plat-omap/include/plat/usb.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 288e29e..b181297 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -46,7 +46,7 @@ struct ehci_hcd_omap_platform_data {
 struct omap_musb_board_data {
 	u8	interface_type;
 	u8	mode;
-	u8	power;
+	u16	power;
 };
 
 enum musb_interface    {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};
-- 
1.6.2.4

Re: [PATCH] musb: fix power field to hold all possible values

[Felipe Balbi]

Hi,

On Tue, Feb 23, 2010 at 03:16:44PM +0530, Ajay Kumar Gupta wrote:
> MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus
> the 'power' field has to hold values above 255.

power on the arch code is same as bMaxPower it will be multiplied by two
on musb_core.c. See line 150 of that file.

Meaning 500mA is set to 250 on the board-file.

-- 
balbi

RE: [PATCH] musb: fix power field to hold all possible values

[Gadiyar, Anand]

Felipe Balbi wrote:

> Hi,
> 
> On Tue, Feb 23, 2010 at 03:16:44PM +0530, Ajay Kumar Gupta wrote:
> > MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus
> > the 'power' field has to hold values above 255.
> 
> power on the arch code is same as bMaxPower it will be multiplied by two
> on musb_core.c. See line 150 of that file.
> 
> Meaning 500mA is set to 250 on the board-file.
> 

Any reason we have the "multiply by 2" there?

- Anand

Re: [PATCH] musb: fix power field to hold all possible values

[Felipe Balbi]

Hi,

On Tue, Feb 23, 2010 at 03:27:39PM +0530, Gadiyar, Anand wrote:
> > power on the arch code is same as bMaxPower it will be multiplied by two
> > on musb_core.c. See line 150 of that file.
> > 
> > Meaning 500mA is set to 250 on the board-file.
> > 
> 
> Any reason we have the "multiply by 2" there?

no big reason. It's just legacy code. Maybe it's to keep consistency
with the gadget framework, donno.

-- 
balbi

RE: [PATCH] musb: fix power field to hold all possible values

[Gupta, Ajay Kumar]

> -----Original Message-----
> From: Felipe Balbi [mailto:me@felipebalbi.com]
> Sent: Tuesday, February 23, 2010 3:22 PM
> To: Gupta, Ajay Kumar
> Cc: linux-omap@vger.kernel.org
> Subject: Re: [PATCH] musb: fix power field to hold all possible values
> 
> Hi,
> 
> On Tue, Feb 23, 2010 at 03:16:44PM +0530, Ajay Kumar Gupta wrote:
> > MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus
> > the 'power' field has to hold values above 255.
> 
> power on the arch code is same as bMaxPower it will be multiplied by two
> on musb_core.c. See line 150 of that file.

Agreed but see comment below.

> 
> Meaning 500mA is set to 250 on the board-file.

Board files are providing the actual mA and it is getting divided in 
Arch/arm/mach-omap2/usb-musb.c. See the code snippet below,

        musb_plat.clock = "ick";
        musb_plat.board_data = board_data;
-->     musb_plat.power = board_data->power >> 1;
        musb_plat.mode = board_data->mode;

So we need to either take this patch or fix this logic of dividing the mA
supplied from all omap board files.

-Ajay
> 
> --
> balbi

Re: [PATCH] musb: fix power field to hold all possible values

[Felipe Balbi]

Hi,

On Tue, Feb 23, 2010 at 08:01:50PM +0530, Gupta, Ajay Kumar wrote:
> Board files are providing the actual mA and it is getting divided in 
> Arch/arm/mach-omap2/usb-musb.c. See the code snippet below,
> 
>         musb_plat.clock = "ick";
>         musb_plat.board_data = board_data;
> -->     musb_plat.power = board_data->power >> 1;
>         musb_plat.mode = board_data->mode;
> 
> So we need to either take this patch or fix this logic of dividing the mA
> supplied from all omap board files.

that's true, had missed that. Sorry.

-- 
balbi

Re: [PATCH] musb: fix power field to hold all possible values

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [100223 12:30]:
> Hi,
> 
> On Tue, Feb 23, 2010 at 08:01:50PM +0530, Gupta, Ajay Kumar wrote:
> > Board files are providing the actual mA and it is getting divided in 
> > Arch/arm/mach-omap2/usb-musb.c. See the code snippet below,
> > 
> >         musb_plat.clock = "ick";
> >         musb_plat.board_data = board_data;
> > -->     musb_plat.power = board_data->power >> 1;
> >         musb_plat.mode = board_data->mode;
> > 
> > So we need to either take this patch or fix this logic of dividing the mA
> > supplied from all omap board files.
> 
> that's true, had missed that. Sorry.

Hmm, I believe this value is also divided somewhere else but
I forgot where. In any case, when making changes like this
please run the standard USB tests for gadgets and OTG.

Otherwise things are guaranteed to break for USB certs :)

Tony

RE: [PATCH] musb: fix power field to hold all possible values

[Gupta, Ajay Kumar]

Hi,
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Friday, February 26, 2010 3:50 AM
> To: Felipe Balbi
> Cc: Gupta, Ajay Kumar; linux-omap@vger.kernel.org
> Subject: Re: [PATCH] musb: fix power field to hold all possible values
> 
> * Felipe Balbi <me@felipebalbi.com> [100223 12:30]:
> > Hi,
> >
> > On Tue, Feb 23, 2010 at 08:01:50PM +0530, Gupta, Ajay Kumar wrote:
> > > Board files are providing the actual mA and it is getting divided in
> > > Arch/arm/mach-omap2/usb-musb.c. See the code snippet below,
> > >
> > >         musb_plat.clock = "ick";
> > >         musb_plat.board_data = board_data;
> > > -->     musb_plat.power = board_data->power >> 1;
> > >         musb_plat.mode = board_data->mode;
> > >
> > > So we need to either take this patch or fix this logic of dividing the
> mA
> > > supplied from all omap board files.
> >
> > that's true, had missed that. Sorry.
> 
> Hmm, I believe this value is also divided somewhere else but
> I forgot where. In any case, when making changes like this
> please run the standard USB tests for gadgets and OTG.
> 
> Otherwise things are guaranteed to break for USB certs :)

Tony,

Currently the flow is,

1. Actual mA provided in all omap board files.
2. mA gets divided in usb-musb.c
3. mA multiplied by two in driver/usb/musb/musb_core.c to pass it to
   hcd->power_budget.

So the current patch fixes the logic in step [1] above to fill mA value
Above 255.

-Ajay
> 
> Tony

RE: [PATCH] musb: fix power field to hold all possible values

[Gupta, Ajay Kumar]

Hi,
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Gupta, Ajay Kumar
> Sent: Friday, February 26, 2010 10:03 AM
> To: Tony Lindgren; Felipe Balbi
> Cc: linux-omap@vger.kernel.org
> Subject: RE: [PATCH] musb: fix power field to hold all possible values
> 
> Hi,
> > -----Original Message-----
> > From: Tony Lindgren [mailto:tony@atomide.com]
> > Sent: Friday, February 26, 2010 3:50 AM
> > To: Felipe Balbi
> > Cc: Gupta, Ajay Kumar; linux-omap@vger.kernel.org
> > Subject: Re: [PATCH] musb: fix power field to hold all possible values
> >
> > * Felipe Balbi <me@felipebalbi.com> [100223 12:30]:
> > > Hi,
> > >
> > > On Tue, Feb 23, 2010 at 08:01:50PM +0530, Gupta, Ajay Kumar wrote:
> > > > Board files are providing the actual mA and it is getting divided in
> > > > Arch/arm/mach-omap2/usb-musb.c. See the code snippet below,
> > > >
> > > >         musb_plat.clock = "ick";
> > > >         musb_plat.board_data = board_data;
> > > > -->     musb_plat.power = board_data->power >> 1;
> > > >         musb_plat.mode = board_data->mode;
> > > >
> > > > So we need to either take this patch or fix this logic of dividing
> the
> > mA
> > > > supplied from all omap board files.
> > >
> > > that's true, had missed that. Sorry.
> >
> > Hmm, I believe this value is also divided somewhere else but
> > I forgot where. In any case, when making changes like this
> > please run the standard USB tests for gadgets and OTG.
> >
> > Otherwise things are guaranteed to break for USB certs :)
> 
> Tony,
> 
> Currently the flow is,
> 
> 1. Actual mA provided in all omap board files.
> 2. mA gets divided in usb-musb.c
> 3. mA multiplied by two in driver/usb/musb/musb_core.c to pass it to
>    hcd->power_budget.
> 
> So the current patch fixes the logic in step [1] above to fill mA value
> Above 255.

Felipe/Tony,

Any update on this patch ?

Regards,
Ajay
> 
> -Ajay
> >
> > 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

Re: [PATCH] musb: fix power field to hold all possible values

[Felipe Balbi]

On Tue, Mar 23, 2010 at 12:41:16PM +0100, ext Gupta, Ajay Kumar wrote:
>Felipe/Tony,
>
>Any update on this patch ?

It's fine by me but I was expecting Tony to pick it up since it's on the 
arch code.

Tony, do you want me to queue it for Greg or you take it forward ?

-- 
balbi

Re: [PATCH] musb: fix power field to hold all possible values

[Felipe Balbi]

On Tue, Feb 23, 2010 at 10:46:44AM +0100, ext Ajay Kumar Gupta wrote:
>MUSB can supply upto 500mA such as, AM3517 and OMAP3EVM Rev >=E and thus
>the 'power' field has to hold values above 255.
>
>
>Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>

applied, thanks

-- 
balbi