Re: v3.11-rc1 USB regressions

[Aaro Koskinen]

Hi,

On Tue, Jul 16, 2013 at 08:33:06AM +0200, Daniel Mack wrote:
> > 	fe4cb0912f8e737f8e4b8b38b9e692f8062f5423
> > 	usb: musb: gadget: remove hcd initialization
> > 	(Reverting this fixes error "cdc_ether: probe of 4-1:1.0 failed
> > 	 with error -110" seen on the host side.)
> 
> Which role does your musb-based hardware have in this case, and which
> MUSB_* config symbols do you set? You should have USB_MUSB_GADGET.

I have USB_MUSB_DUAL_ROLE set. But also with USB_MUSB_GADGET the result
is the same.

The N900/RX-51 board file sets mode to MUSB_PERIPHERAL (see
mach-omap2/board-rx51.c).

> From 5f33d42f2dffb82d22b83a030f14fe2331a935b7 Mon Sep 17 00:00:00 2001
> From: Daniel Mack <zonque@xxxxxxxxx>
> Date: Tue, 16 Jul 2013 08:19:49 +0200
> Subject: [PATCH] ARM: omap2: fix musb usage for n8x0
> 
> Commit b7e2e75a8c ("usb: gadget: drop unused USB_GADGET_MUSB_HDRC")
> dropped a config symbol that was unused by the musb core, but it turns
> out that board support code still had references to it.
> 
> As the core now handles both dual role and host-only modes, we can just
> pass MUSB_OTG as mode from board files.

This looks fine, however, I currently cannot test the host mode.

A.

> Signed-off-by: Daniel Mack <zonque@xxxxxxxxx>
> ---
>  arch/arm/mach-omap2/board-n8x0.c | 4 ----
>  arch/arm/mach-omap2/usb-musb.c   | 5 +----
>  2 files changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
> index f6eeb87..827d150 100644
> --- a/arch/arm/mach-omap2/board-n8x0.c
> +++ b/arch/arm/mach-omap2/board-n8x0.c
> @@ -122,11 +122,7 @@ static struct musb_hdrc_config musb_config = {
>  };
>  
>  static struct musb_hdrc_platform_data tusb_data = {
> -#ifdef CONFIG_USB_GADGET_MUSB_HDRC
>  	.mode		= MUSB_OTG,
> -#else
> -	.mode		= MUSB_HOST,
> -#endif
>  	.set_power	= tusb_set_power,
>  	.min_power	= 25,	/* x2 = 50 mA drawn from VBUS as peripheral */
>  	.power		= 100,	/* Max 100 mA VBUS for host mode */
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
> index 8c4de27..bc89723 100644
> --- a/arch/arm/mach-omap2/usb-musb.c
> +++ b/arch/arm/mach-omap2/usb-musb.c
> @@ -38,11 +38,8 @@ static struct musb_hdrc_config musb_config = {
>  };
>  
>  static struct musb_hdrc_platform_data musb_plat = {
> -#ifdef CONFIG_USB_GADGET_MUSB_HDRC
>  	.mode		= MUSB_OTG,
> -#else
> -	.mode		= MUSB_HOST,
> -#endif
> +
>  	/* .clock is set dynamically */
>  	.config		= &musb_config,
>  
> -- 
> 1.8.1.4
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/