From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Oct 2011 08:19:05 +0000 (+1100)
Subject: Merge remote-tracking branch 'usb/usb-next'
X-Git-Tag: next-20111025~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=772f9fe3766bb72df0cfa453a37229591d77424a;p=karo-tx-linux.git

Merge remote-tracking branch 'usb/usb-next'

Conflicts:
	arch/arm/mach-omap2/Makefile
---

772f9fe3766bb72df0cfa453a37229591d77424a
diff --cc arch/arm/mach-omap2/Makefile
index 512978586b2b,7317a2b39dd1..69ab1c069134
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -216,21 -229,24 +216,17 @@@ obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board
  					   board-zoom-debugboard.o
  obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o \
  					   board-zoom-peripherals.o \
 -					   board-zoom-display.o \
 -					   board-flash.o \
 -					   hsmmc.o
 -obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o \
 -					   hsmmc.o
 +					   board-zoom-display.o
 +obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o
  obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o
 -obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o \
 -					   hsmmc.o
 -obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \
 -					   hsmmc.o
 -obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \
 -					   hsmmc.o
 -obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o \
 -					   hsmmc.o
 +obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o
 +obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o
- obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \
- 					   omap_phy_internal.o
- obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o \
- 					   omap_phy_internal.o
++obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o
++obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o
 +
- obj-$(CONFIG_MACH_PCM049)		+= board-omap4pcm049.o \
- 					   omap_phy_internal.o
++obj-$(CONFIG_MACH_PCM049)		+= board-omap4pcm049.o
  
- obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o \
- 					   omap_phy_internal.o
+ obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o
  
  obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o
  
diff --cc arch/arm/mach-shmobile/board-mackerel.c
index 81b3dfdf331b,c20612ea5d0e..3689ad2e9156
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -811,10 -808,9 +811,11 @@@ static struct usbhs_private usbhs1_priv
  		},
  		.driver_param = {
  			.buswait_bwait	= 4,
+ 			.has_otg	= 1,
  			.pipe_type	= usbhs1_pipe_cfg,
  			.pipe_size	= ARRAY_SIZE(usbhs1_pipe_cfg),
 +			.d0_tx_id	= SHDMA_SLAVE_USB1_TX,
 +			.d1_rx_id	= SHDMA_SLAVE_USB1_RX,
  		},
  	},
  };
diff --cc drivers/usb/Kconfig
index 85d5a011dca6,4ac2750491de..791f11bed606
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -54,8 -60,9 +60,8 @@@ config USB_ARCH_HAS_OHC
  # some non-PCI hcds implement EHCI
  config USB_ARCH_HAS_EHCI
  	boolean
- 	default y if PPC_83xx
+ 	default y if FSL_SOC
  	default y if PPC_MPC512x
 -	default y if SOC_AU1200
  	default y if ARCH_IXP4XX
  	default y if ARCH_W90X900
  	default y if ARCH_AT91SAM9G45