Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/usb/musb/musb_core.c

diff --combined Makefile
index 5713b16c21395c3d0023a4db527c7b8f0885fa74,1d03c1644ddbffe9dbec85d05b3faceafbe01c77..5fe5788071f384de6714fa574f73a23177dbb5ea
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 27
- EXTRAVERSION = -rc7
+ EXTRAVERSION = -rc8
  NAME = Rotary Wombat
  
  # *DOCUMENTATION*
@@@ -16,9 -16,6 +16,9 @@@
  # o  print "Entering directory ...";
  MAKEFLAGS += -rR --no-print-directory
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
@@@ -174,8 -171,6 +174,8 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
                                  -e s/sh.*/sh/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
@@@ -196,7 -191,7 +196,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE   := $(ARCH)

diff --combined drivers/usb/gadget/omap_udc.c
index af76a251572c580b2c4bd6f158d8eee90e53cd2d,bb54cca4c54381736ead413cec0e3747e4af9b78..34e9e393f929b5b35b7710d5065ab30fbe25595e
--- 1/drivers/usb/gadget/omap_udc.c
--- 2/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@@ -787,7 -787,7 +787,7 @@@ static void dma_channel_claim(struct om
                        omap_set_dma_dest_params(ep->lch,
                                OMAP_DMA_PORT_TIPB,
                                OMAP_DMA_AMODE_CONSTANT,
-                               (unsigned long) io_v2p(UDC_DATA_DMA),
+                               UDC_DATA_DMA,
                                0, 0);
                }
        } else {
@@@ -804,7 -804,7 +804,7 @@@
                        omap_set_dma_src_params(ep->lch,
                                OMAP_DMA_PORT_TIPB,
                                OMAP_DMA_AMODE_CONSTANT,
-                               (unsigned long) io_v2p(UDC_DATA_DMA),
+                               UDC_DATA_DMA,
                                0, 0);
                        /* EMIFF or SDRC */
                        omap_set_dma_dest_burst_mode(ep->lch,
@@@ -2313,13 -2313,6 +2313,13 @@@ static int proc_otg_show(struct seq_fil
  
        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_readl(OMAP2_CONTROL_DEVCONF0);
        } else {

diff --combined drivers/usb/host/ehci-hcd.c
index b0a5d104204797c210df8eea4bfd925b8252ac64,8409e0705d6365c34e6db7252cc39eb60575877a..068946214f8d907810f986c40338f542b3def2f3
--- 1/drivers/usb/host/ehci-hcd.c
--- 2/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@@ -145,16 -145,6 +145,6 @@@ static int handshake (struct ehci_hcd *
        return -ETIMEDOUT;
  }
  
- static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
-                                      u32 mask, u32 done, int usec)
- {
-       int error = handshake(ehci, ptr, mask, done, usec);
-       if (error)
-               ehci_to_hcd(ehci)->state = HC_STATE_HALT;
- 
-       return error;
- }
- 
  /* force HC to halt state from unknown (EHCI spec section 2.3) */
  static int ehci_halt (struct ehci_hcd *ehci)
  {
@@@ -173,6 -163,22 +163,22 @@@
                          STS_HALT, STS_HALT, 16 * 125);
  }
  
+ static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
+                                      u32 mask, u32 done, int usec)
+ {
+       int error;
+ 
+       error = handshake(ehci, ptr, mask, done, usec);
+       if (error) {
+               ehci_halt(ehci);
+               ehci_to_hcd(ehci)->state = HC_STATE_HALT;
+               ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n",
+                       ptr, mask, done, error);
+       }
+ 
+       return error;
+ }
+ 
  /* put TDI/ARC silicon into EHCI mode */
  static void tdi_reset (struct ehci_hcd *ehci)
  {
@@@ -1009,11 -1015,6 +1015,11 @@@ MODULE_LICENSE ("GPL")
  #define       PLATFORM_DRIVER         ehci_hcd_au1xxx_driver
  #endif
  
 +#ifdef CONFIG_ARCH_OMAP34XX
 +#include "ehci-omap.c"
 +#define       PLATFORM_DRIVER         ehci_hcd_omap_driver
 +#endif
 +
  #ifdef CONFIG_PPC_PS3
  #include "ehci-ps3.c"
  #define       PS3_SYSTEM_BUS_DRIVER   ps3_ehci_driver