--- zzzz-none-000/linux-2.6.28.10/drivers/usb/musb/Kconfig	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/drivers/usb/musb/Kconfig	2010-05-17 16:39:56.000000000 +0000
@@ -8,9 +8,7 @@
 
 # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
 config USB_MUSB_HDRC
-	depends on (USB || USB_GADGET) && HAVE_CLK
-	depends on !SUPERH
-	select TWL4030_USB if MACH_OMAP_3430SDP
+	depends on USB || USB_GADGET
 	tristate 'Inventra Highspeed Dual Role Controller (TI, ...)'
 	help
 	  Say Y here if your system has a dual role high speed USB
@@ -33,6 +31,10 @@
 	default y if ARCH_DAVINCI
 	default y if ARCH_OMAP2430
 	default y if ARCH_OMAP34XX
+	help
+	  Use a static <asm/arch/hdrc_cnf.h> file to describe how the
+	  controller is configured (endpoints, mechanisms, etc) on the
+	  current iteration of a given system-on-chip.
 
 comment "DaVinci 644x USB support"
 	depends on USB_MUSB_HDRC && ARCH_DAVINCI
@@ -43,9 +45,12 @@
 comment "OMAP 343x high speed USB support"
 	depends on USB_MUSB_HDRC && ARCH_OMAP34XX
 
+comment "PUMA5 high speed USB support"
+	depends on USB_MUSB_HDRC && ARCH_PUMA5
+
 config USB_TUSB6010
 	boolean "TUSB 6010 support"
-	depends on USB_MUSB_HDRC && !USB_MUSB_SOC
+	depends on USB_MUSB_HDRC && !USB_MUSB_SOC && !ARCH_PUMA5
 	default y
 	help
 	  The TUSB 6010 chip, from Texas Instruments, connects a discrete
@@ -85,7 +90,7 @@
 	  (With a "Mini-AB" connector, you should enable USB OTG.)
 
 config USB_MUSB_OTG
-	depends on USB && USB_GADGET && PM && EXPERIMENTAL
+	depends on USB && USB_GADGET && EXPERIMENTAL && !ARCH_DAVINCI_DM646x
 	bool "Both host and peripheral:  USB OTG (On The Go) Device"
 	select USB_GADGET_MUSB_HDRC
 	select USB_OTG
@@ -110,6 +115,45 @@
 
 endchoice
 
+choice
+        prompt "Reserve EP for"
+        depends on USB && (USB_MUSB_HOST || USB_OTG) && USB_MUSB_HDRC && EXPERIMENTAL
+        help
+          Option for reserving additional endpoint for guaranteed support for at the 
+	  least 
+		1. one ISO device or 
+		2. enable Interrupt Endpoint scheduling (reserve for INT devices) or 
+		3. do not reserve any endpoint.
+	
+	  One endpoint is reserved for handling BULK devices always by default.
+
+config  MUSB_RSRV_NONE
+        boolean "NONE"
+        depends on USB && (USB_MUSB_HOST || USB_OTG) && USB_MUSB_HDRC
+        bool
+        help
+          Either Schedule Interrupt Endpoint or reserve ISO endpoint 
+	  is selected.
+config  MUSB_SCHEDULE_INTR_EP
+        boolean "Enabling Scheduling of Interrupt Endpoint (EXPERIMENTAL)"
+        depends on USB && (USB_MUSB_HOST || USB_OTG) && USB_MUSB_HDRC && EXPERIMENTAL
+        bool
+        help
+          Schedule Interrupt Endpoint resources for supporting multiple
+          Interrupt URB's on a single INTR EP.  Use SOF for scheduling the EP.
+
+config  MUSB_RESERVE_ISO_EP
+        boolean "ISO Endpoint"
+        depends on USB && (USB_MUSB_HOST || USB_OTG) && USB_MUSB_HDRC
+        bool
+        help
+           Say Y if your system needs to handle ISO devices such as Webcams,
+           USB audio devices etc.  If not say N.  If you select Y then a
+           Endpoint is reserved for handling ISO devices and will not be
+           available for handling other types of traffic such as BULK, INT.
+
+endchoice
+
 # enable peripheral support (including with OTG)
 config USB_GADGET_MUSB_HDRC
 	bool
@@ -139,6 +183,14 @@
 	  you can still disable it at run time using the "use_dma=n" module
 	  parameter.
 
+config USB_HOST_HSET_MODE
+        bool 'Host Mode Electrical Support<EXPERIMENTAL>'
+        depends on USB_MUSB_HDRC && (USB_MUSB_HOST || USB_MUSB_OTG) && USB_MUSB_HDRC=y
+        default y if USB_TUSB6010
+        help
+                The Host Mode Electrical Test Support feature is used for testing
+                the DUT(embedded host mode) for electrical compliance.
+
 config USB_INVENTRA_DMA
 	bool
 	depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
@@ -149,7 +201,7 @@
 config USB_TI_CPPI_DMA
 	bool
 	depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-	default ARCH_DAVINCI
+	default ( ARCH_DAVINCI || ARCH_PUMA5 )
 	help
 	  Enable DMA transfers when TI CPPI DMA is available.
 
@@ -162,11 +214,12 @@
 	help
 	  Enable DMA transfers on TUSB 6010 when OMAP DMA is available.
 
-config	USB_MUSB_DEBUG
+config	USB_MUSB_LOGLEVEL
 	depends on USB_MUSB_HDRC
-	bool "Enable debugging messages"
-	default n
+	int  'Logging Level (0 - none / 3 - annoying / ... )'
+	default 0
 	help
-	  This enables musb debugging. To set the logging level use the debug
-	  module parameter. Starting at level 3, per-transfer (urb, usb_request,
-	  packet, or dma transfer) tracing may kick in.
+	  Set the logging level. 0 disables the debugging altogether,
+	  although when USB_DEBUG is set the value is at least 1.
+	  Starting at level 3, per-transfer (urb, usb_request, packet,
+	  or dma transfer) tracing may kick in.