public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the usb tree with the arm tree
@ 2011-01-04  4:55 Stephen Rothwell
  2011-01-04  5:29 ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-01-04  4:55 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Mac Lin, Anton Vorontsov, Russell King,
	Deepak Sikri, Viresh Kumar, Pavankumar Kondeti

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/Kconfig between commit
760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
OHCI bus glue for cns3xxx SOCs") from the arm tree and commits
c8c38de9d8002578599222296b90696745ac0fe3 ("USB host: Adding USB ehci &
ohci support for spear platform") and
b0848aea10da186372582f33152efdda43944f26 ("USB: EHCI: Add MSM Host
Controller driver") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/Kconfig
index 5a7c8f1,b8e70a9..0000000
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -41,7 -41,7 +41,8 @@@ config USB_ARCH_HAS_OHC
  	default y if MFD_TC6393XB
  	default y if ARCH_W90X900
  	default y if ARCH_DAVINCI_DA8XX
 +	default y if ARCH_CNS3XXX
+ 	default y if PLAT_SPEAR
  	# PPC:
  	default y if STB03xxx
  	default y if PPC_MPC52xx
@@@ -67,7 -62,9 +63,10 @@@ config USB_ARCH_HAS_EHC
  	default y if ARCH_AT91SAM9G45
  	default y if ARCH_MXC
  	default y if ARCH_OMAP3
 +	default y if ARCH_CNS3XXX
+ 	default y if ARCH_VT8500
+ 	default y if PLAT_SPEAR
+ 	default y if ARCH_MSM
  	default PCI
  
  # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the usb tree with the arm tree
@ 2011-01-04  4:58 Stephen Rothwell
  2011-01-04  5:07 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-01-04  4:58 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Mac Lin, Anton Vorontsov, Russell King

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-hcd.c between commit
760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
OHCI bus glue for cns3xxx SOCs") from the arm tree and various commits
from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/host/ehci-hcd.c
index d0c8f7c,72732da..0000000
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@@ -1216,9 -1229,19 +1229,23 @@@ MODULE_LICENSE ("GPL")
  #define PLATFORM_DRIVER		ehci_octeon_driver
  #endif
  
 +#ifdef CONFIG_USB_CNS3XXX_EHCI
 +#include "ehci-cns3xxx.c"
 +#define PLATFORM_DRIVER		cns3xxx_ehci_driver
++
+ #ifdef CONFIG_ARCH_VT8500
+ #include "ehci-vt8500.c"
+ #define	PLATFORM_DRIVER		vt8500_ehci_driver
+ #endif
+ 
+ #ifdef CONFIG_PLAT_SPEAR
+ #include "ehci-spear.c"
+ #define PLATFORM_DRIVER		spear_ehci_hcd_driver
+ #endif
+ 
+ #ifdef CONFIG_USB_EHCI_MSM
+ #include "ehci-msm.c"
+ #define PLATFORM_DRIVER		ehci_msm_driver
  #endif
  
  #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the usb tree with the arm tree
@ 2011-01-31  4:53 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-01-31  4:53 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Russell King, Yuan-Hsin Chen

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/Kconfig between commit
82e6923e1862428b755ec306b3dbccf926849314 ("ARM: lh7a40x: remove
unmaintained platform support") from the arm tree and commit
0fe6f1d1f612035d78d8d195bbc3485a341386d5 ("usb: udc: add Faraday fusb300
driver") 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 drivers/usb/gadget/Kconfig
index 88d191b,4845539..0000000
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -176,6 -176,30 +176,18 @@@ config USB_FSL_USB
  	default USB_GADGET
  	select USB_GADGET_SELECTED
  
+ config USB_GADGET_FUSB300
+ 	boolean "Faraday FUSB300 USB Peripheral Controller"
+ 	select USB_GADGET_DUALSPEED
+ 	help
+ 	   Faraday usb device controller FUSB300 driver
+ 
+ config USB_FUSB300
+ 	tristate
+ 	depends on USB_GADGET_FUSB300
+ 	default USB_GADGET
+ 	select USB_GADGET_SELECTED
+ 
 -config USB_GADGET_LH7A40X
 -	boolean "LH7A40X"
 -	depends on ARCH_LH7A40X
 -	help
 -	   This driver provides USB Device Controller driver for LH7A40x
 -
 -config USB_LH7A40X
 -	tristate
 -	depends on USB_GADGET_LH7A40X
 -	default USB_GADGET
 -	select USB_GADGET_SELECTED
 -
  config USB_GADGET_OMAP
  	boolean "OMAP USB Device Controller"
  	depends on ARCH_OMAP

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-31  4:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-04  4:55 linux-next: manual merge of the usb tree with the arm tree Stephen Rothwell
2011-01-04  5:29 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2011-01-04  4:58 Stephen Rothwell
2011-01-04  5:07 ` Stephen Rothwell
2011-01-04  5:29   ` Greg KH
2011-01-31  4:53 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox