Defy usb vs omapzoom.diff

diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/Kconfig /mnt/sdc1/kernels/usb/Kconfig
171,172d170
< source "drivers/usb/ipchost/Kconfig"
< 
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/Makefile /mnt/sdc1/kernels/usb/Makefile
54d53
< obj-$(CONFIG_USB_IPC)           += ipchost/
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/core/hub.c /mnt/sdc1/kernels/usb/core/hub.c
796,797d795
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 
800d797
< #endif
811,812d807
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 
815d809
< #endif
819,820d812
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 
823d814
< #endif
827,828c818
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 			clear_port_feature(hub->hdev, por1,
---
> 			clear_port_feature(hub->hdev, port1,
830d819
< #endif
837,838c826
< 				(portchange & USB_PORT_STAT_C_CONNECTION)) {
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
---
> 				(portchange & USB_PORT_STAT_C_CONNECTION))
840,841d827
< #endif
< 		}
1663d1648
< 
1670d1654
< 
2846d2829
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
2848,2850d2830
< #else
< 	retval = 0;
< #endif
2861,2864d2840
< #ifdef CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 	udev->speed = USB_SPEED_HIGH;
< 	udev->state = USB_STATE_UNAUTHENTICATED;
< #endif
2959d2934
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
2961,2964d2935
< #else
< 
< 				r = usb_control_msg(udev, (PIPE_CONTROL << 30) | (0x02 << 8) | USB_DIR_IN,
< #endif
2989d2959
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
2991,2993d2960
< #else
< 			retval = 0;
< #endif
3018d2984
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
3025,3032d2990
< #else
< 			/* Make device use proper address. */
< 			update_devnum(udev, devnum);
< 
< 			usb_set_device_state(udev, USB_STATE_ADDRESS);
< 			usb_ep0_reinit(udev);
< 			retval = 0;
< #endif
3241d3198
< 
3463,3469d3419
< #if 0// CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 		if ((u16) hub->change_bits[0] == 0) {
< 			printk("Skip modem reset\n");
< 			return;
< 		}
< #endif
< 
3604d3553
< 
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/gadget/Kconfig /mnt/sdc1/kernels/usb/gadget/Kconfig
1067,1075d1066
< config USB_MOT_ANDROID
<        tristate "MOTO Android Gadget"
<        help
<          The MOTO Android gadget provides mass storage, adb and ethernet
<          transport.
< 
<          Say "y" to link the driver statically, or "m" to build a
<          dynamically linked module called "g_mot_android".
< 
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/host/ehci-hcd.c /mnt/sdc1/kernels/usb/host/ehci-hcd.c
278d277
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
282,285d280
< #else
< 	command |= CMD_LRESET;
< 	dbg_cmd (ehci, "reset", command);
< #endif
288d282
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
291,294d284
< #else
< 	retval = 0;
< #endif
< 
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/host/ehci-omap.c /mnt/sdc1/kernels/usb/host/ehci-omap.c
215,238d214
< #ifdef CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 
< 	/* FIXME: Find proper defines for the addresses */
< 
< 	/* We need to get the interrupts in order */
< 	printk(KERN_INFO "EHCI-OMAP: Fixing after 2nd-boot\n");
< 
< 	/* Mask IRQs */
< 	omap_writel(0x2000, 0x482000cc);
< 
< 	/* Reset USBINTR */
< 	omap_writel(0x00, 0x48064818);
< 
< 	/* Set ERROR status on everything (this may not be necessary) */
< 	omap_writel(0x3f, 0x48064814);
< 
< 	/* Clear HCINTERRUPTSTATUS */
< 	omap_writel(0x4000007f, 0x4806440c);
< 
< 	/* Clear HCINTERRUPTDISABLE */
< 	omap_writel(0xc000007f, 0x48064414);
< 
< #endif
< 
242,251d217
< #ifdef CONFIG_MACH_OMAP_MAPPHONE_DEFY
< 
< 	/* Enable IRQs */
< 	omap_writel(0x0, 0x4806201c);
< 
< 	/* Set them to event pending */
< 	omap_writel(0x7, 0x48062018);
< 
< #endif
< 
318c284
< #ifndef CONFIG_MACH_OMAP_MAPPHONE_DEFY
---
> 
324c290
< #endif
---
> 
Only in /mnt/sdc1/kernels/jordan-kernel/drivers/usb: ipchost
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/musb/musb_core.c /mnt/sdc1/kernels/usb/musb/musb_core.c
118,119d117
< struct musb *g_musb;
< unsigned musb_debug;
1934,1937d1931
< 
< #if defined(CONFIG_USB_MOT_ANDROID) && defined(CONFIG_USB_MUSB_OTG)
< 	g_musb = musb;
< #endif
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/musb/musb_core.h /mnt/sdc1/kernels/usb/musb/musb_core.h
569,570d568
< extern struct musb *g_musb;
< 
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/musb/musb_debug.h /mnt/sdc1/kernels/usb/musb/musb_debug.h
45,59d44
< #define xprintk(level, facility, format, args...) do { \
< 	if (_dbg_level(level)) { \
< 		printk(facility "%s %d: " format , \
< 				__func__, __LINE__ , ## args); \
< 	} } while (0)
< 
< extern unsigned musb_debug;
< 
< static inline int _dbg_level(unsigned l)
< {
< 	return musb_debug >= l;
< }
< 
< #define DBG(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args)
< 
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/musb/omap2430.c /mnt/sdc1/kernels/usb/musb/omap2430.c
50,75d49
< #if defined(CONFIG_USB_MOT_ANDROID) && defined(CONFIG_USB_MUSB_OTG)
<  /* blocking notifier support */
< 
< void cpcap_musb_notifier_call(unsigned long event)
< {
< 	struct musb *musb = g_musb;
< 	printk("cpcap_musb_notifier_call \n");
< 	switch (event) {
< 	case USB_EVENT_VBUS:
< 		DBG(1, "VBUS Connect\n");
< 		DBG(1, "MUSB - Hold L3 Bus and C State Constraint \n");
< 		pm_runtime_get_sync(musb->controller);
< 		break;
< 
< 	case USB_EVENT_NONE:
< 		DBG(1, "VBUS Disconnect\n");
< 		pm_runtime_mark_last_busy(musb->controller);
< 		pm_runtime_put_autosuspend(musb->controller);
< 		break;
< 	default:
< 		DBG(1, "ID float\n");
< 	}
< 
< }
< #endif /*CONFIG_USB_MOT_ANDROID*/
< 
277c251
< 	struct musb *musb = otg_work->musb;
---
>         struct musb *musb = otg_work->musb;
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/otg/Kconfig /mnt/sdc1/kernels/usb/otg/Kconfig
141,147d140
< config CPCAP_USB
< 	tristate "CPCAP USB Transceiver Driver"
< 	select USB_OTG_UTILS
< 	help
< 	  Enable this to support the USB OTG transceiver on the
< 	  Motorola CPCAP PMIC
< 
diff -r /mnt/sdc1/kernels/jordan-kernel/drivers/usb/otg/Makefile /mnt/sdc1/kernels/usb/otg/Makefile
20d19
< obj-$(CONFIG_CPCAP_USB)		+= cpcap-usb.o
Only in /mnt/sdc1/kernels/jordan-kernel/drivers/usb/otg: cpcap-usb.c