[patch-v2.6.36 0/2] musb patches

[patch-v2.6.36 0/2] musb patches

[Ajay Kumar Gupta]

Greg,

These are two patches (acked by Felipe) for v2.6.36 kernel.
Sanity tested on OMAP3EVM.

Regards,
Ajay

Anand Gadiyar (2):
  musb: Kill board specific pinmux from driver file
  usb: musb: do not override DMA mode in channel program

 drivers/usb/musb/musbhsdma.c |    5 +----
 drivers/usb/musb/omap2430.c  |    6 ------
 2 files changed, 1 insertions(+), 10 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] musb: Kill board specific pinmux from driver file

[Ajay Kumar Gupta]

From: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>

This pin-muxing is best done in the board files. The driver should
not do this explicitly.

Also, this code causes a warning to be thrown when OMAP2430 and OMAP3/4
support are enabled in the same kernel.

Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
Acked-by: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/musb/omap2430.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index e06d65e..2111a24 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -32,8 +32,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <plat/mux.h>
-
 #include "musb_core.h"
 #include "omap2430.h"
 
@@ -194,10 +192,6 @@ int __init musb_platform_init(struct musb *musb, void *board_data)
 	u32 l;
 	struct omap_musb_board_data *data = board_data;
 
-#if defined(CONFIG_ARCH_OMAP2430)
-	omap_cfg_reg(AE5_2430_USB0HS_STP);
-#endif

[PATCH 2/2] usb: musb: do not override DMA mode in channel program

[Ajay Kumar Gupta]

From: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>

There is no reason for the DMA channel program to override the
DMA mode passed down by its caller. Use the passed parameter
directly, and let the caller handle the decision on which mode
is to be used.

Signed-off-by: Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>
Acked-by: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/musb/musbhsdma.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index dc66e43..6dc107f 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -173,10 +173,7 @@ static int dma_channel_program(struct dma_channel *channel,
 	musb_channel->max_packet_sz = packet_sz;
 	channel->status = MUSB_DMA_STATUS_BUSY;
 
-	if ((mode == 1) && (len >= packet_sz))
-		configure_channel(channel, packet_sz, 1, dma_addr, len);
-	else
-		configure_channel(channel, packet_sz, 0, dma_addr, len);
+	configure_channel(channel, packet_sz, mode, dma_addr, len);
 
 	return true;
 }
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] musb: Kill board specific pinmux from driver file

[Tony Lindgren]

* Ajay Kumar Gupta <ajay.gupta@ti.com> [100708 13:59]:
> From: Anand Gadiyar <gadiyar@ti.com>
> 
> This pin-muxing is best done in the board files. The driver should
> not do this explicitly.
> 
> Also, this code causes a warning to be thrown when OMAP2430 and OMAP3/4
> support are enabled in the same kernel.
> 
> Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>

Acked-by: Tony Lindgren <tony@atomide.com>

> ---
>  drivers/usb/musb/omap2430.c |    6 ------
>  1 files changed, 0 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> index e06d65e..2111a24 100644
> --- a/drivers/usb/musb/omap2430.c
> +++ b/drivers/usb/musb/omap2430.c
> @@ -32,8 +32,6 @@
>  #include <linux/clk.h>
>  #include <linux/io.h>
>  
> -#include <plat/mux.h>
> -
>  #include "musb_core.h"
>  #include "omap2430.h"
>  
> @@ -194,10 +192,6 @@ int __init musb_platform_init(struct musb *musb, void *board_data)
>  	u32 l;
>  	struct omap_musb_board_data *data = board_data;
>  
> -#if defined(CONFIG_ARCH_OMAP2430)
> -	omap_cfg_reg(AE5_2430_USB0HS_STP);
> -#endif
> -
>  	/* We require some kind of external transceiver, hooked
>  	 * up through ULPI.  TWL4030-family PMICs include one,
>  	 * which needs a driver, drivers aren't always needed.
> -- 
> 1.6.2.4
> 
> --
> 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 1/2] musb: Kill board specific pinmux from driver file

[Greg KH]

On Fri, Jul 09, 2010 at 11:15:33AM +0300, Tony Lindgren wrote:
> * Ajay Kumar Gupta <ajay.gupta@ti.com> [100708 13:59]:
> > From: Anand Gadiyar <gadiyar@ti.com>
> > 
> > This pin-muxing is best done in the board files. The driver should
> > not do this explicitly.
> > 
> > Also, this code causes a warning to be thrown when OMAP2430 and OMAP3/4
> > support are enabled in the same kernel.
> > 
> > Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> > Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
> 
> Acked-by: Tony Lindgren <tony@atomide.com>

Thanks, I've added this to the patch.

greg k-h

> 
> > ---
> >  drivers/usb/musb/omap2430.c |    6 ------
> >  1 files changed, 0 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> > index e06d65e..2111a24 100644
> > --- a/drivers/usb/musb/omap2430.c
> > +++ b/drivers/usb/musb/omap2430.c
> > @@ -32,8 +32,6 @@
> >  #include <linux/clk.h>
> >  #include <linux/io.h>
> >  
> > -#include <plat/mux.h>
> > -
> >  #include "musb_core.h"
> >  #include "omap2430.h"
> >  
> > @@ -194,10 +192,6 @@ int __init musb_platform_init(struct musb *musb, void *board_data)
> >  	u32 l;
> >  	struct omap_musb_board_data *data = board_data;
> >  
> > -#if defined(CONFIG_ARCH_OMAP2430)
> > -	omap_cfg_reg(AE5_2430_USB0HS_STP);
> > -#endif
> > -
> >  	/* We require some kind of external transceiver, hooked
> >  	 * up through ULPI.  TWL4030-family PMICs include one,
> >  	 * which needs a driver, drivers aren't always needed.
> > -- 
> > 1.6.2.4
> > 
> > --
> > 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