--- zzzz-none-000/linux-2.6.32.61/drivers/usb/musb/Makefile	2013-06-10 09:43:48.000000000 +0000
+++ ar9-7330-650/linux-2.6.32.61/drivers/usb/musb/Makefile	2014-02-13 16:45:06.000000000 +0000
@@ -1,77 +1,117 @@
+
 #
-# for USB OTG silicon based on Mentor Graphics INVENTRA designs
+# Makefile for USB Core files and filesystem
 #
+	ifxusb_host-objs    := ifxusb_driver.o
+	ifxusb_host-objs    += ifxusb_ctl.o
+	ifxusb_host-objs    += ifxusb_cif.o
+	ifxusb_host-objs    += ifxusb_cif_h.o
+	ifxusb_host-objs    += ifxhcd.o
+	ifxusb_host-objs    += ifxhcd_es.o
+	ifxusb_host-objs    += ifxhcd_intr.o
+	ifxusb_host-objs    += ifxhcd_queue.o
 
-musb_hdrc-objs := musb_core.o
-
-obj-$(CONFIG_USB_MUSB_HDRC)	+= musb_hdrc.o
-
-ifeq ($(CONFIG_ARCH_DAVINCI),y)
-	musb_hdrc-objs	+= davinci.o
+ifeq ($(CONFIG_TWINPASS),y)
+        EXTRA_CFLAGS        += -D__IS_TWINPASS__
 endif
-
-ifeq ($(CONFIG_USB_TUSB6010),y)
-	musb_hdrc-objs	+= tusb6010.o
+ifeq ($(CONFIG_MIPS_TWINPASS),y)
+        EXTRA_CFLAGS        += -D__IS_TWINPASS__
 endif
 
-ifeq ($(CONFIG_ARCH_OMAP2430),y)
-	musb_hdrc-objs	+= omap2430.o
+ifeq ($(CONFIG_DANUBE),y)
+        EXTRA_CFLAGS        += -D__IS_DANUBE__
 endif
-
-ifeq ($(CONFIG_ARCH_OMAP3430),y)
-	musb_hdrc-objs	+= omap2430.o
+ifeq ($(CONFIG_MIPS_DANUBE),y)
+        EXTRA_CFLAGS        += -D__IS_DANUBE__
 endif
 
-ifeq ($(CONFIG_BF54x),y)
-	musb_hdrc-objs	+= blackfin.o
+ifeq ($(CONFIG_AMAZON_SE),y)
+        EXTRA_CFLAGS        += -D__IS_AMAZON_SE__
 endif
-
-ifeq ($(CONFIG_BF52x),y)
-	musb_hdrc-objs	+= blackfin.o
+ifeq ($(CONFIG_MIPS_AMAZON_SE),y)
+        EXTRA_CFLAGS        += -D__IS_AMAZON_SE__
 endif
 
-ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
-	musb_hdrc-objs		+= musb_gadget_ep0.o musb_gadget.o
+ifeq ($(CONFIG_AR9),y)
+        EXTRA_CFLAGS        += -D__IS_AR9__
+endif
+ifeq ($(CONFIG_MIPS_AR9),y)
+        EXTRA_CFLAGS        += -D__IS_AR9__
 endif
 
-ifeq ($(CONFIG_USB_MUSB_HDRC_HCD),y)
-	musb_hdrc-objs		+= musb_virthub.o musb_host.o
+ifeq ($(CONFIG_AMAZON_S),y)
+        EXTRA_CFLAGS        += -D__IS_AR9__
+endif
+ifeq ($(CONFIG_MIPS_AMAZON_S),y)
+        EXTRA_CFLAGS        += -D__IS_AR9__
 endif
 
-# the kconfig must guarantee that only one of the
-# possible I/O schemes will be enabled at a time ...
-# PIO only, or DMA (several potential schemes).
-# though PIO is always there to back up DMA, and for ep0
+ifeq ($(CONFIG_VR9),y)
+        EXTRA_CFLAGS        += -D__IS_VR9__
+endif
+ifeq ($(CONFIG_MIPS_VR9),y)
+        EXTRA_CFLAGS        += -D__IS_VR9__
+endif
 
-ifneq ($(CONFIG_MUSB_PIO_ONLY),y)
+ifeq ($(CONFIG_AR10),y)
+        EXTRA_CFLAGS        += -D__IS_AR10__
+endif
+ifeq ($(CONFIG_MIPS_AR10),y)
+        EXTRA_CFLAGS        += -D__IS_AR10__
+endif
 
-  ifeq ($(CONFIG_USB_INVENTRA_DMA),y)
-    musb_hdrc-objs		+= musbhsdma.o
+ifeq ($(CONFIG_USB_HOST_IFX),y)
+	EXTRA_CFLAGS  += -Dlinux -D__LINUX__
+	EXTRA_CFLAGS  += -D__IS_HOST__
+	EXTRA_CFLAGS  += -D__KERNEL__
+endif
 
-  else
-    ifeq ($(CONFIG_USB_TI_CPPI_DMA),y)
-      musb_hdrc-objs		+= cppi_dma.o
+ifeq ($(CONFIG_USB_HOST_IFX),m)
+	EXTRA_CFLAGS  += -Dlinux -D__LINUX__
+	EXTRA_CFLAGS  += -D__IS_HOST__
+	EXTRA_CFLAGS  += -D__KERNEL__
+endif
 
-    else
-      ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y)
-        musb_hdrc-objs		+= tusb6010_omap.o
+## ifeq ($(CONFIG_USB_DEBUG),y)
+	EXTRA_CFLAGS  += -D__DEBUG__
+	EXTRA_CFLAGS  += -D__ENABLE_DUMP__
+## endif
 
-      endif
-    endif
-  endif
+ifeq ($(CONFIG_USB_HOST_IFX_B),y)
+        EXTRA_CFLAGS  += -D__IS_DUAL__
+endif
+ifeq ($(CONFIG_USB_HOST_IFX_1),y)
+        EXTRA_CFLAGS  += -D__IS_FIRST__
+endif
+ifeq ($(CONFIG_USB_HOST_IFX_2),y)
+        EXTRA_CFLAGS  += -D__IS_SECOND__
 endif
 
+ifeq ($(CONFIG_USB_HOST_IFX_FORCE_USB11),y)
+	EXTRA_CFLAGS  += -D__FORCE_USB11__
+endif
+ifeq ($(CONFIG_USB_HOST_IFX_WITH_HS_ELECT_TST),y)
+	EXTRA_CFLAGS  += -D__WITH_HS_ELECT_TST__
+endif
+ifeq ($(CONFIG_USB_HOST_IFX_WITH_ISO),y)
+	EXTRA_CFLAGS  += -D__EN_ISOC__
+endif
+ifeq ($(CONFIG_USB_HOST_IFX_UNALIGNED_ADJ),y)
+	EXTRA_CFLAGS  += -D__UNALIGNED_BUFFER_ADJ__
+endif
+ifeq ($(CONFIG_USB_HOST_IFX_UNALIGNED_CHK),y)
+	EXTRA_CFLAGS  += -D__UNALIGNED_BUFFER_CHK__
+endif
 
-################################################################################
-
-# FIXME remove all these extra "-DMUSB_* things, stick to CONFIG_*
+#	EXTRA_CFLAGS  += -D__DYN_SOF_INTR__
+	EXTRA_CFLAGS  += -D__UEIP__
+#	EXTRA_CFLAGS  += -D__EN_ISOC__
+#	EXTRA_CFLAGS  += -D__EN_ISOC_SPLIT__
 
-ifeq ($(CONFIG_USB_INVENTRA_MUSB_HAS_AHB_ID),y)
-	EXTRA_CFLAGS += -DMUSB_AHB_ID
+ifneq ($(CONFIG_USB_HOST_IFX_AVM_YIELD),y)
+## 20110628 AVM/WK New flag for less SOF IRQs
+	EXTRA_CFLAGS  += -D__USE_TIMER_4_SOF__
 endif
 
-# Debugging
+obj-$(CONFIG_USB_HOST_IFX)	+= ifxusb_host.o
 
-ifeq ($(CONFIG_USB_MUSB_DEBUG),y)
-	EXTRA_CFLAGS += -DDEBUG
-endif