Skip to contentSkip to conversation

arm: omap4: panda: fix initialize musb

PATCH In review [email protected] 3 participants 3 messages Dec 9, 2010 – Dec 10, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 arm: omap4: panda: fix initialize musb

From: Ming Lei <[email protected]>

Obviously we should only initialize musb once.

Signed-off-by Ming Lei <[email protected]>
---
 arch/arm/mach-omap2/board-omap4panda.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/board-omap4panda.c +0 -3
index 22599fc..85371be 100644
@@ -393,9 +393,6 @@ static void __init omap4_panda_init(void)
 	usb_nop_xceiv_register();
 	omap4_ehci_init();
 	usb_musb_init(&musb_board_data);
-	/* FIXME: allow multi-omap to boot until musb is updated for omap4 */
-	if (!cpu_is_omap44xx())
-		usb_musb_init(&musb_board_data);
 }
 
 static void __init omap4_panda_map_io(void)
Signature · 1 line
1.7.3
#1 lore raw

[email protected] had written, on 12/09/2010 11:02 AM, the following:

Quoted 14 lines

From: Ming Lei <[email protected]>

Obviously we should only initialize musb once.

Signed-off-by Ming Lei <[email protected]>
---
 arch/arm/mach-omap2/board-omap4panda.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/board-omap4panda.c +0 -0
index 22599fc..85371be 100644

arch/arm/mach-omap2/board-omap4panda.c static void __init omap4_panda_init(void) · line 398

Quoted 9 lines
arch/arm/mach-omap2/board-omap4panda.c +0 -3
@@ -393,9 +393,6 @@ static void __init omap4_panda_init(void)
 	usb_nop_xceiv_register();
 	omap4_ehci_init();
 	usb_musb_init(&musb_board_data);
-	/* FIXME: allow multi-omap to boot until musb is updated for omap4 */
-	if (!cpu_is_omap44xx())
-		usb_musb_init(&musb_board_data);
 }
 
 static void __init omap4_panda_map_io(void)

Looks good to me. since this is for l-o master branch, I think this should probably be squashed to:

commit ec787afd05aad0cdb0b0d2948b356569805e5b30

Author: Felipe Balbi <[email protected]>
Date:   Wed Dec 1 13:48:54 2010 +0200

arm: omap4: panda: initialize musb

initialize the musb port on pandaboard.

Signed-off-by Felipe Balbi <[email protected]>

Regards,
Nishanth Menon

#2 lore raw
Quoted 26 lines · Nishanth Menon

[email protected] had written, on 12/09/2010 11:02 AM, the following:

Quoted 14 lines

From: Ming Lei <[email protected]>

Obviously we should only initialize musb once.

Signed-off-by Ming Lei <[email protected]>

---
arch/arm/mach-omap2/board-omap4panda.c | 3 ---

1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/board-omap4panda.c +0 -0
index 22599fc..85371be 100644

arch/arm/mach-omap2/board-omap4panda.c static void __init omap4_panda_init(void) · line 397

Quoted 8 lines
arch/arm/mach-omap2/board-omap4panda.c +0 -3
@@ -393,9 +393,6 @@ static void __init omap4_panda_init(void)
 	usb_nop_xceiv_register();
 	omap4_ehci_init();
 	usb_musb_init(&musb_board_data);
-	/* FIXME: allow multi-omap to boot until musb is updated for omap4 */
-	if (!cpu_is_omap44xx())
-		usb_musb_init(&musb_board_data);
 }
 static void __init omap4_panda_map_io(void)

Looks good to me. since this is for l-o master branch, I think this should probably be squashed to:

commit ec787afd05aad0cdb0b0d2948b356569805e5b30

Quoted 8 lines
Author: Felipe Balbi <[email protected]>
Date:   Wed Dec 1 13:48:54 2010 +0200

arm: omap4: panda: initialize musb

initialize the musb port on pandaboard.

Signed-off-by Felipe Balbi <[email protected]>

that was probably a merge conflict auto-resolution mess:

Fixed now. Thanks. I added you SOB Ming.

Signature · 1 line
balbi