* linux-next: manual merge of the usb tree with the omap_dss2 tree
@ 2011-03-07 5:54 Stephen Rothwell
2011-03-07 16:19 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-03-07 5:54 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Steve Sakoman, Tomi Valkeinen,
Keshava Munegowda, Felipe Balbi
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-omap2/board-overo.c between commit fd045fe21361 ("OMAP:
DSS2: Add DSS2 support for Overo") from the omap_dss2 tree and commits
181b250cf532 ("arm: omap: usb: create common enums and structures for
ehci and ohci") and 9e64bb1e9f06 ("arm: omap: usb: Invoke usbhs core
device initialization") from the usb tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-omap2/board-overo.c
index d621ee8,08770cc..0000000
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@@ -580,12 -414,19 +580,12 @@@ static void __init overo_init_early(voi
omap2_init_common_infrastructure();
omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
mt46h32m32lf6_sdrc_params);
- omap_init_irq();
}
- static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
- .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
- .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
- .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-static struct platform_device *overo_devices[] __initdata = {
- &overo_lcd_device,
-};
-
+ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
+ .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
+ .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
+ .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
.phy_reset = true,
.reset_gpio_port[0] = -EINVAL,
@@@ -613,10 -454,9 +613,10 @@@ static void __init overo_init(void
omap_serial_init();
overo_flash_init();
usb_musb_init(&musb_board_data);
- usb_ehci_init(&ehci_pdata);
+ usbhs_init(&usbhs_bdata);
- overo_ads7846_init();
+ overo_spi_init();
overo_init_smsc911x();
+ overo_display_init();
/* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the usb tree with the omap_dss2 tree
2011-03-07 5:54 linux-next: manual merge of the usb tree with the omap_dss2 tree Stephen Rothwell
@ 2011-03-07 16:19 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2011-03-07 16:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Steve Sakoman, Tomi Valkeinen,
Keshava Munegowda, Felipe Balbi
On Mon, Mar 07, 2011 at 04:54:18PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-omap2/board-overo.c between commit fd045fe21361 ("OMAP:
> DSS2: Add DSS2 support for Overo") from the omap_dss2 tree and commits
> 181b250cf532 ("arm: omap: usb: create common enums and structures for
> ehci and ohci") and 9e64bb1e9f06 ("arm: omap: usb: Invoke usbhs core
> device initialization") from the usb tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks. Felipe, am I going to have problems merging with Linus when the
.39 merge window opens up because of these omap changes in my tree?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-07 16:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-07 5:54 linux-next: manual merge of the usb tree with the omap_dss2 tree Stephen Rothwell
2011-03-07 16:19 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox