diff mbox

mfd: omap-usb-host: Make TLL mode work again

Message ID 1313664271-694-1-git-send-email-gadiyar@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Anand Gadiyar Aug. 18, 2011, 10:44 a.m. UTC
This code section seems to have been accidentally copy pasted.
It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
register and prevents the TLL mode from working correctly.

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Keshava Munegowda <keshava_mgowda@ti.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
Against v3.1-rc2; tested against linux-next as of 20110817 as well.

This probably needs to go to -stable as well. The original code
by me worked fine but this was broken during the code reorganization
Keshava did.

 drivers/mfd/omap-usb-host.c |    1 -
 1 file changed, 1 deletion(-)

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

Comments

Munegowda, Keshava Aug. 18, 2011, 11:22 a.m. UTC | #1
On Thu, Aug 18, 2011 at 4:14 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> This code section seems to have been accidentally copy pasted.
> It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
> register and prevents the TLL mode from working correctly.
>
> Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> Cc: Keshava Munegowda <keshava_mgowda@ti.com>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> ---
> Against v3.1-rc2; tested against linux-next as of 20110817 as well.
>
> This probably needs to go to -stable as well. The original code
> by me worked fine but this was broken during the code reorganization
> Keshava did.
>
>  drivers/mfd/omap-usb-host.c |    1 -
>  1 file changed, 1 deletion(-)
>
> Index: linux-2.6/drivers/mfd/omap-usb-host.c
> ===================================================================
> --- linux-2.6.orig/drivers/mfd/omap-usb-host.c
> +++ linux-2.6/drivers/mfd/omap-usb-host.c
> @@ -676,7 +676,6 @@ static void usbhs_omap_tll_init(struct d
>                                | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
>                                | OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
>
> -                       reg |= (1 << (i + 1));
>                } else
>                        continue;

Samuel Ortiz and balbi
please ack this patch

I am going to re-base runtime pm patches on top of this patch.


Regards
keshava
--
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
Felipe Balbi Aug. 18, 2011, 11:24 a.m. UTC | #2
HI,

On Thu, Aug 18, 2011 at 04:52:22PM +0530, Munegowda, Keshava wrote:
> On Thu, Aug 18, 2011 at 4:14 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> > This code section seems to have been accidentally copy pasted.
> > It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
> > register and prevents the TLL mode from working correctly.
> >
> > Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> > Cc: Keshava Munegowda <keshava_mgowda@ti.com>
> > Cc: Samuel Ortiz <sameo@linux.intel.com>

Sam, you can apply this one:

Acked-by: Felipe Balbi <balbi@ti.com>

But I think it needs to be resent with Cc: stable@kernel.org
Anand Gadiyar Aug. 18, 2011, 11:44 a.m. UTC | #3
Balbi, Felipe wrote:
> HI,
> 
> On Thu, Aug 18, 2011 at 04:52:22PM +0530, Munegowda, Keshava wrote:
> > On Thu, Aug 18, 2011 at 4:14 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> > > This code section seems to have been accidentally copy pasted.
> > > It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
> > > register and prevents the TLL mode from working correctly.
> > >
> > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> > > Cc: Keshava Munegowda <keshava_mgowda@ti.com>
> > > Cc: Samuel Ortiz <sameo@linux.intel.com>
> 
> Sam, you can apply this one:
> 
> Acked-by: Felipe Balbi <balbi@ti.com>
> 
> But I think it needs to be resent with Cc: stable@kernel.org

I'm trying to avoid "Cc: stable@kernel.org" since RMK complained about
this on the Linux ARM kernel list. [1]

- Anand

[1] http://marc.info/?l=linux-arm-kernel&m=131107297012093&w=2
--
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
Greg KH Aug. 18, 2011, 6:26 p.m. UTC | #4
On Thu, Aug 18, 2011 at 05:14:17PM +0530, Gadiyar, Anand wrote:
> Balbi, Felipe wrote:
> > HI,
> > 
> > On Thu, Aug 18, 2011 at 04:52:22PM +0530, Munegowda, Keshava wrote:
> > > On Thu, Aug 18, 2011 at 4:14 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> > > > This code section seems to have been accidentally copy pasted.
> > > > It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
> > > > register and prevents the TLL mode from working correctly.
> > > >
> > > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> > > > Cc: Keshava Munegowda <keshava_mgowda@ti.com>
> > > > Cc: Samuel Ortiz <sameo@linux.intel.com>
> > 
> > Sam, you can apply this one:
> > 
> > Acked-by: Felipe Balbi <balbi@ti.com>
> > 
> > But I think it needs to be resent with Cc: stable@kernel.org
> 
> I'm trying to avoid "Cc: stable@kernel.org" since RMK complained about
> this on the Linux ARM kernel list. [1]

Why would he do that?  You need to put the Cc: in the signed off by
area, and all will be fine.  If you just put it in your email, you will
get an automated email from me telling you to go read
Documentation/stable_kernel_rules.txt which tells you exactly how to do
this properly.

greg k-h
--
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
Anand Gadiyar Aug. 19, 2011, 5:12 a.m. UTC | #5
Greg KH wrote:
> On Thu, Aug 18, 2011 at 05:14:17PM +0530, Gadiyar, Anand wrote:
> > Balbi, Felipe wrote:
> > > HI,
> > > 
> > > On Thu, Aug 18, 2011 at 04:52:22PM +0530, Munegowda, Keshava wrote:
> > > > On Thu, Aug 18, 2011 at 4:14 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> > > > > This code section seems to have been accidentally copy pasted.
> > > > > It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
> > > > > register and prevents the TLL mode from working correctly.
> > > > >
> > > > > Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> > > > > Cc: Keshava Munegowda <keshava_mgowda@ti.com>
> > > > > Cc: Samuel Ortiz <sameo@linux.intel.com>
> > > 
> > > Sam, you can apply this one:
> > > 
> > > Acked-by: Felipe Balbi <balbi@ti.com>
> > > 
> > > But I think it needs to be resent with Cc: stable@kernel.org
> > 
> > I'm trying to avoid "Cc: stable@kernel.org" since RMK complained about
> > this on the Linux ARM kernel list. [1]
> 
> Why would he do that?  You need to put the Cc: in the signed off by
> area, and all will be fine.  If you just put it in your email, you will
> get an automated email from me telling you to go read
> Documentation/stable_kernel_rules.txt which tells you exactly how to do
> this properly.

Thanks for clearing that up.

I'm resending with Felipe's ack and CCing stable@kernel.org.

- Anand
--
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
Samuel Ortiz Aug. 22, 2011, 2:45 p.m. UTC | #6
Hi Anand,

On Thu, Aug 18, 2011 at 04:14:31PM +0530, Anand Gadiyar wrote:
> This code section seems to have been accidentally copy pasted.
> It causes incorrect bits to be set up in the TLL_CHANNEL_CONF
> register and prevents the TLL mode from working correctly.
Patch applied, with Felipe's ACK and stable@kernel.org Cc'ed.

Cheers,
Samuel.
diff mbox

Patch

Index: linux-2.6/drivers/mfd/omap-usb-host.c
===================================================================
--- linux-2.6.orig/drivers/mfd/omap-usb-host.c
+++ linux-2.6/drivers/mfd/omap-usb-host.c
@@ -676,7 +676,6 @@  static void usbhs_omap_tll_init(struct d
 				| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
 				| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
 
-			reg |= (1 << (i + 1));
 		} else
 			continue;