[PATCH 0/2] musb patches

[PATCH 0/2] musb patches

[Felipe Balbi]

Hi Tony, all

I have this two patches for musb before we merge it
upstream.

The first one makes MUSB_OTG depending on PM
otherwise we have a cyclic dependency and the
second one get back on ignoring disconnect
interrupt because I noticed that tusb2.0
gets broken after a power cycle without this
"check"

Felipe Balbi (2):
  usb: musb: MUSB_OTG should depend on PM
  usb: musb: ignore disconnect on suspend

 drivers/usb/musb/Kconfig     |    3 +--
 drivers/usb/musb/musb_core.c |    6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

[PATCH 1/2] usb: musb: MUSB_OTG should depend on PM

[Felipe Balbi]

Current musb Kconfig causes cyclic depency on x86
arch. The best fix is to depend on PM in order to
build on OTG mode.

Anyone interested in reproducing the error in your
linux-omap trees, just make ARCH=x86 menuconfig

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/Kconfig |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index a485a86..acbbd5f 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -88,10 +88,9 @@ config USB_MUSB_PERIPHERAL
 	  (With a "Mini-AB" connector, you should enable USB OTG.)
 
 config USB_MUSB_OTG
-	depends on USB && USB_GADGET && EXPERIMENTAL
+	depends on USB && USB_GADGET && PM && EXPERIMENTAL
 	bool "Both host and peripheral:  USB OTG (On The Go) Device"
 	select USB_GADGET_MUSB_HDRC
-	select USB_OTG
 	select PM
 	help
 	   The most notable feature of USB OTG is support for a
-- 
1.5.6.rc1

[PATCH 2/2] usb: musb: ignore disconnect on suspend

[Felipe Balbi]

This still needed, otherwise tusb2.0 won't connect after
a power cycle.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_core.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 019898a..5b92f21 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -659,7 +659,11 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 			switch (musb->xceiv.state) {
 #ifdef CONFIG_USB_OTG
 			case OTG_STATE_A_SUSPEND:
-				musb->ignore_disconnect = 0;
+				/* We need to ignore disconnect on suspend
+				 * otherwise tusb 2.0 won't reconnect after a
+				 * power cycle, which breaks otg compliance.
+				 */
+				musb->ignore_disconnect = 1;
 				musb_g_reset(musb);
 				/* FALLTHROUGH */
 			case OTG_STATE_A_WAIT_BCON:	/* OPT TD.4.7-900ms */
-- 
1.5.6.rc1

Re: [PATCH 2/2] usb: musb: ignore disconnect on suspend

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [080611 14:09]:
> This still needed, otherwise tusb2.0 won't connect after
> a power cycle.

Pushing today.

Tony

> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  drivers/usb/musb/musb_core.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 019898a..5b92f21 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -659,7 +659,11 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
>  			switch (musb->xceiv.state) {
>  #ifdef CONFIG_USB_OTG
>  			case OTG_STATE_A_SUSPEND:
> -				musb->ignore_disconnect = 0;
> +				/* We need to ignore disconnect on suspend
> +				 * otherwise tusb 2.0 won't reconnect after a
> +				 * power cycle, which breaks otg compliance.
> +				 */
> +				musb->ignore_disconnect = 1;
>  				musb_g_reset(musb);
>  				/* FALLTHROUGH */
>  			case OTG_STATE_A_WAIT_BCON:	/* OPT TD.4.7-900ms */
> -- 
> 1.5.6.rc1
> 
> --
> 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] usb: musb: MUSB_OTG should depend on PM

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [080611 14:09]:
> Current musb Kconfig causes cyclic depency on x86
> arch. The best fix is to depend on PM in order to
> build on OTG mode.
> 
> Anyone interested in reproducing the error in your
> linux-omap trees, just make ARCH=x86 menuconfig

I guess this is now obsolete with Dave's HAS_CLK patch?

Tony

> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  drivers/usb/musb/Kconfig |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> index a485a86..acbbd5f 100644
> --- a/drivers/usb/musb/Kconfig
> +++ b/drivers/usb/musb/Kconfig
> @@ -88,10 +88,9 @@ config USB_MUSB_PERIPHERAL
>  	  (With a "Mini-AB" connector, you should enable USB OTG.)
>  
>  config USB_MUSB_OTG
> -	depends on USB && USB_GADGET && EXPERIMENTAL
> +	depends on USB && USB_GADGET && PM && EXPERIMENTAL
>  	bool "Both host and peripheral:  USB OTG (On The Go) Device"
>  	select USB_GADGET_MUSB_HDRC
> -	select USB_OTG
>  	select PM
>  	help
>  	   The most notable feature of USB OTG is support for a
> -- 
> 1.5.6.rc1
> 
> --
> 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] usb: musb: MUSB_OTG should depend on PM

[Felipe Balbi]

On Mon, Jun 23, 2008 at 02:13:49PM +0300, Tony Lindgren wrote:
> * Felipe Balbi <felipe.balbi@nokia.com> [080611 14:09]:
> > Current musb Kconfig causes cyclic depency on x86
> > arch. The best fix is to depend on PM in order to
> > build on OTG mode.
> > 
> > Anyone interested in reproducing the error in your
> > linux-omap trees, just make ARCH=x86 menuconfig
> 
> I guess this is now obsolete with Dave's HAS_CLK patch?

Yes, it was removed already :-)

-- 
	- Balbi