From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 Sep 2008 21:57:09 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~287
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=95f289aeff4867bebb783c8482f8a5ec3aeba249;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/usb/gadget/omap_udc.c
	drivers/usb/musb/Kconfig
	drivers/usb/musb/Makefile
	drivers/usb/musb/cppi_dma.c
	drivers/usb/musb/davinci.c
	drivers/usb/musb/musb_core.c
	drivers/usb/musb/musb_core.h
	drivers/usb/musb/musb_debug.h
	drivers/usb/musb/musb_gadget.c
	drivers/usb/musb/musb_gadget_ep0.c
	drivers/usb/musb/musb_host.c
	drivers/usb/musb/musbhsdma.c
	drivers/usb/musb/omap2430.c
	drivers/usb/musb/omap2430.h
	drivers/usb/musb/tusb6010.c
	drivers/usb/musb/tusb6010_omap.c
---

95f289aeff4867bebb783c8482f8a5ec3aeba249
diff --cc drivers/i2c/chips/isp1301_omap.c
index 28902ebd553,4655b794ebe..f7172709933
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@@ -31,6 -31,6 +31,7 @@@
  #include <linux/usb/otg.h>
  #include <linux/i2c.h>
  #include <linux/workqueue.h>
++#include <linux/io.h>
  
  #include <asm/irq.h>
  #include <mach/usb.h>
diff --cc drivers/usb/gadget/omap_udc.c
index a2638eeecca,574c53831a0..4596154398d
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@@ -2310,17 -2311,10 +2311,17 @@@ static int proc_otg_show(struct seq_fil
  	u32		trans;
  	char		*ctrl_name;
  
- 	tmp = omap_readw(OTG_REV);
+ 	tmp = omap_readl(OTG_REV);
  	if (cpu_is_omap24xx()) {
 +		/*
 +		 * REVISIT: Not clear how this works on OMAP2.  trans
 +		 * is ANDed to produce bits 7 and 8, which might make
 +		 * sense for USB_TRANSCEIVER_CTRL on OMAP1,
 +		 * but with CONTROL_DEVCONF, these bits have something to
 +		 * do with the frame adjustment counter and McBSP2.
 +		 */
  		ctrl_name = "control_devconf";
- 		trans = omap_ctrl_readb(OMAP2_CONTROL_DEVCONF0);
+ 		trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
  	} else {
  		ctrl_name = "tranceiver_ctrl";
  		trans = omap_readw(USB_TRANSCEIVER_CTRL);