On Thu, Dec 09, 2010 at 11:21:44AM -0600, Nishanth Menon wrote:
[email protected] had written, on 12/09/2010 11:02 AM, the following:
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(-)
diff --git a/arch/arm/mach-omap2/board-omap4panda.c
b/arch/arm/mach-omap2/board-omap4panda.c
index 22599fc..85371be 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -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]>
that was probably a merge conflict auto-resolution mess:
Fixed now. Thanks. I added you SOB Ming.
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
