[PATCH 0/2] ARM: OMAP: fix USB regression on Nokia boards

[PATCH 0/2] ARM: OMAP: fix USB regression on Nokia boards

[Aaro Koskinen]

Hi,

USB subsystem changes broke the USB peripheral/gadget on N800, N810 and
RX-51/N900 during the merge window. We need to fix this in board files. I
tested all these with 3.11-rc4 + g_ether + ssh.

Aaro Koskinen (1):
  ARM: OMAP: rx51: change musb mode to OTG

Daniel Mack (1):
  ARM: omap2: fix musb usage for n8x0

 arch/arm/mach-omap2/board-n8x0.c | 4 ----
 arch/arm/mach-omap2/board-rx51.c | 2 +-
 arch/arm/mach-omap2/usb-musb.c   | 5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)

-- 
1.8.3.2

[PATCH 1/2] ARM: omap2: fix musb usage for n8x0

[Aaro Koskinen]

From: Daniel Mack <zonque@gmail.com>

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.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 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.3.2

[PATCH 2/2] ARM: OMAP: rx51: change musb mode to OTG

[Aaro Koskinen]

Peripheral-only mode got broken in v3.11-rc1 because of unknown reasons.
Change the mode to OTG, in practice that should work equally well even
when/if the regression gets fixed.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/arm/mach-omap2/board-rx51.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index d2ea68e..773510556 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -85,7 +85,7 @@ static struct omap_board_mux board_mux[] __initdata = {
 
 static struct omap_musb_board_data musb_board_data = {
 	.interface_type		= MUSB_INTERFACE_ULPI,
-	.mode			= MUSB_PERIPHERAL,
+	.mode			= MUSB_OTG,
 	.power			= 0,
 };
 
-- 
1.8.3.2

[PATCH 2/2] ARM: OMAP: rx51: change musb mode to OTG

[Daniel Mack]

Hi Aaro,

On 06.08.2013 19:06, Aaro Koskinen wrote:
> Peripheral-only mode got broken in v3.11-rc1 because of unknown reasons.

Given that you have a board that is affected, could you investigate a
little maybe? I would have done it a long time ago, but I don't have
access to such hardware unfortunately.

Not saying that your patch shouldn't go in, but at some point, we need a
sane explanation why this has happened.


Thanks,
Daniel

[PATCH 0/2] ARM: OMAP: fix USB regression on Nokia boards

[Aaro Koskinen]

Hi,

On Tue, Aug 06, 2013 at 08:06:14PM +0300, Aaro Koskinen wrote:
> USB subsystem changes broke the USB peripheral/gadget on N800, N810 and
> RX-51/N900 during the merge window. We need to fix this in board files. I
> tested all these with 3.11-rc4 + g_ether + ssh.

Ping?

A.

> Aaro Koskinen (1):
>   ARM: OMAP: rx51: change musb mode to OTG
> 
> Daniel Mack (1):
>   ARM: omap2: fix musb usage for n8x0
> 
>  arch/arm/mach-omap2/board-n8x0.c | 4 ----
>  arch/arm/mach-omap2/board-rx51.c | 2 +-
>  arch/arm/mach-omap2/usb-musb.c   | 5 +----
>  3 files changed, 2 insertions(+), 9 deletions(-)
> 
> -- 
> 1.8.3.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 0/2] ARM: OMAP: fix USB regression on Nokia boards

[Tony Lindgren]

* Aaro Koskinen <aaro.koskinen@iki.fi> [130815 12:25]:
> Hi,
> 
> On Tue, Aug 06, 2013 at 08:06:14PM +0300, Aaro Koskinen wrote:
> > USB subsystem changes broke the USB peripheral/gadget on N800, N810 and
> > RX-51/N900 during the merge window. We need to fix this in board files. I
> > tested all these with 3.11-rc4 + g_ether + ssh.
> 
> Ping?

Applying into omap-for-v3.11/fixes thanks.

Tony