* [PATCH] arm: omap4: panda: fix initialize musb
@ 2010-12-09 17:02 tom.leiming
2010-12-09 17:21 ` Nishanth Menon
0 siblings, 1 reply; 3+ messages in thread
From: tom.leiming @ 2010-12-09 17:02 UTC (permalink / raw)
To: tony, balbi; +Cc: linux-omap, Ming Lei
From: Ming Lei <tom.leiming@gmail.com>
Obviously we should only initialize musb once.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
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)
--
1.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] arm: omap4: panda: fix initialize musb
2010-12-09 17:02 [PATCH] arm: omap4: panda: fix initialize musb tom.leiming
@ 2010-12-09 17:21 ` Nishanth Menon
2010-12-10 8:21 ` Felipe Balbi
0 siblings, 1 reply; 3+ messages in thread
From: Nishanth Menon @ 2010-12-09 17:21 UTC (permalink / raw)
To: tom.leiming; +Cc: tony, balbi, linux-omap
tom.leiming@gmail.com had written, on 12/09/2010 11:02 AM, the following:
> From: Ming Lei <tom.leiming@gmail.com>
>
> Obviously we should only initialize musb once.
>
> Signed-off-by: Ming Lei <tom.leiming@gmail.com>
> ---
> 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 <balbi@ti.com>
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 <balbi@ti.com>
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] arm: omap4: panda: fix initialize musb
2010-12-09 17:21 ` Nishanth Menon
@ 2010-12-10 8:21 ` Felipe Balbi
0 siblings, 0 replies; 3+ messages in thread
From: Felipe Balbi @ 2010-12-10 8:21 UTC (permalink / raw)
To: Nishanth Menon; +Cc: tom.leiming, tony, balbi, linux-omap
On Thu, Dec 09, 2010 at 11:21:44AM -0600, Nishanth Menon wrote:
>tom.leiming@gmail.com had written, on 12/09/2010 11:02 AM, the following:
>>From: Ming Lei <tom.leiming@gmail.com>
>>
>>Obviously we should only initialize musb once.
>>
>>Signed-off-by: Ming Lei <tom.leiming@gmail.com>
>>---
>> 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 <balbi@ti.com>
>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 <balbi@ti.com>
that was probably a merge conflict auto-resolution mess:
Fixed now. Thanks. I added you SOB Ming.
--
balbi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-10 8:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-09 17:02 [PATCH] arm: omap4: panda: fix initialize musb tom.leiming
2010-12-09 17:21 ` Nishanth Menon
2010-12-10 8:21 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox