Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c

1 files changed, 19 insertions, 2 deletions

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 0cd6c7795d90..5450e628157f 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -116,6 +116,8 @@
 #define OMAP_UHH_DEBUG_CSR                              (0x44)
 
 /* EHCI Register Set */
+#define EHCI_INSNREG04                                  (0xA0)
+#define EHCI_INSNREG04_DISABLE_UNSUSPEND                (1 << 5)
 #define EHCI_INSNREG05_ULPI                             (0xA4)
 #define EHCI_INSNREG05_ULPI_CONTROL_SHIFT               31
 #define EHCI_INSNREG05_ULPI_PORTSEL_SHIFT               24
@@ -352,8 +354,8 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
                 reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
 
         /* Bypass the TLL module for PHY mode operation */
-         if (omap_rev() <= OMAP3430_REV_ES2_1) {
-                dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1 \n");
+        if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {
+                dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1\n");
                 if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) ||
                         (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) ||
                                 (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))
@@ -382,6 +384,18 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
         dev_dbg(omap->dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
 
 
+        /*
+         * An undocumented "feature" in the OMAP3 EHCI controller,
+         * causes suspended ports to be taken out of suspend when
+         * the USBCMD.Run/Stop bit is cleared (for example when
+         * we do ehci_bus_suspend).
+         * This breaks suspend-resume if the root-hub is allowed
+         * to suspend. Writing 1 to this undocumented register bit
+         * disables this feature and restores normal behavior.
+         */
+        ehci_omap_writel(omap->ehci_base, EHCI_INSNREG04,
+                                EHCI_INSNREG04_DISABLE_UNSUSPEND);
+
         if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_TLL) ||
                 (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_TLL) ||
                         (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_TLL)) {
@@ -659,6 +673,9 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
                 goto err_add_hcd;
         }
 
+        /* root ports should always stay powered */
+        ehci_port_power(omap->ehci, 1);
+
         return 0;
 
 err_add_hcd: