Merge tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
 "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.

  It's touches a lot of different parts of the kernel, all USB drivers,
  due to some API cleanups (getting rid of the ancient err() macro) and
  some changes that are needed for USB 3.0 power management updates.

  There are also lots of new drivers, pimarily gadget, but others as
  well.  We deleted a staging driver, which was nice, and finally
  dropped the obsolete usbfs code, which will make Al happy to never
  have to touch that again.

  There were some build errors in the tree that linux-next found a few
  days ago, but those were fixed by the most recent changes (all were
  due to us not building with CONFIG_PM disabled.)

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
  xhci: Fix DIV_ROUND_UP compile error.
  xhci: Fix compile with CONFIG_USB_SUSPEND=n
  USB: Fix core compile with CONFIG_USB_SUSPEND=n
  brcm80211: Fix compile error for .disable_hub_initiated_lpm.
  Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
  MAINTAINERS: Add myself as maintainer to the USB PHY Layer
  USB: EHCI: fix command register configuration lost problem
  USB: Remove races in devio.c
  USB: ehci-platform: remove update_device
  USB: Disable hub-initiated LPM for comms devices.
  xhci: Add Intel U1/U2 timeout policy.
  xhci: Add infrastructure for host-specific LPM policies.
  USB: Add macros for interrupt endpoint types.
  xhci: Reserve one command for USB3 LPM disable.
  xhci: Some Evaluate Context commands must succeed.
  USB: Disable USB 3.0 LPM in critical sections.
  USB: Add support to enable/disable USB3 link states.
  USB: Allow drivers to disable hub-initiated LPM.
  USB: Calculate USB 3.0 exit latencies for LPM.
  USB: Refactor code to set LPM support flag.
  ...

Conflicts:
	arch/arm/mach-exynos/mach-nuri.c
	arch/arm/mach-exynos/mach-universal_c210.c
	drivers/net/wireless/ath/ath6kl/usb.c

1 files changed, 21 insertions, 11 deletions

diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index d7d9c0ec9515..479dc047da3a 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -49,7 +49,6 @@
 #include <linux/of.h>
 
 #include "core.h"
-#include "io.h"
 
 /*
  * All these registers belong to OMAP's Wrapper around the
@@ -143,6 +142,17 @@ struct dwc3_omap {
         u32                     dma_status:1;
 };
 
+static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
+{
+        return readl(base + offset);
+}
+
+static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value)
+{
+        writel(value, base + offset);
+}
+
+
 static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
 {
         struct dwc3_omap        *omap = _omap;
@@ -150,7 +160,7 @@ static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
 
         spin_lock(&omap->lock);
 
-        reg = dwc3_readl(omap->base, USBOTGSS_IRQSTATUS_1);
+        reg = dwc3_omap_readl(omap->base, USBOTGSS_IRQSTATUS_1);
 
         if (reg & USBOTGSS_IRQ1_DMADISABLECLR) {
                 dev_dbg(omap->dev, "DMA Disable was Cleared\n");
@@ -184,10 +194,10 @@ static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
         if (reg & USBOTGSS_IRQ1_IDPULLUP_FALL)
                 dev_dbg(omap->dev, "IDPULLUP Fall\n");
 
-        dwc3_writel(omap->base, USBOTGSS_IRQSTATUS_1, reg);
+        dwc3_omap_writel(omap->base, USBOTGSS_IRQSTATUS_1, reg);
 
-        reg = dwc3_readl(omap->base, USBOTGSS_IRQSTATUS_0);
-        dwc3_writel(omap->base, USBOTGSS_IRQSTATUS_0, reg);
+        reg = dwc3_omap_readl(omap->base, USBOTGSS_IRQSTATUS_0);
+        dwc3_omap_writel(omap->base, USBOTGSS_IRQSTATUS_0, reg);
 
         spin_unlock(&omap->lock);
 
@@ -270,7 +280,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
         omap->base      = base;
         omap->dwc3      = dwc3;
 
-        reg = dwc3_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
+        reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
 
         utmi_mode = of_get_property(node, "utmi-mode", &size);
         if (utmi_mode && size == sizeof(*utmi_mode)) {
@@ -293,10 +303,10 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
                 }
         }
 
-        dwc3_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, reg);
+        dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, reg);
 
         /* check the DMA Status */
-        reg = dwc3_readl(omap->base, USBOTGSS_SYSCONFIG);
+        reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);
         omap->dma_status = !!(reg & USBOTGSS_SYSCONFIG_DMADISABLE);
 
         /* Set No-Idle and No-Standby */
@@ -306,7 +316,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
         reg |= (USBOTGSS_SYSCONFIG_STANDBYMODE(USBOTGSS_STANDBYMODE_NO_STANDBY)
                 | USBOTGSS_SYSCONFIG_IDLEMODE(USBOTGSS_IDLEMODE_NO_IDLE));
 
-        dwc3_writel(omap->base, USBOTGSS_SYSCONFIG, reg);
+        dwc3_omap_writel(omap->base, USBOTGSS_SYSCONFIG, reg);
 
         ret = devm_request_irq(dev, omap->irq, dwc3_omap_interrupt, 0,
                         "dwc3-omap", omap);
@@ -318,7 +328,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
 
         /* enable all IRQs */
         reg = USBOTGSS_IRQO_COREIRQ_ST;
-        dwc3_writel(omap->base, USBOTGSS_IRQENABLE_SET_0, reg);
+        dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_0, reg);
 
         reg = (USBOTGSS_IRQ1_OEVT |
                         USBOTGSS_IRQ1_DRVVBUS_RISE |
@@ -330,7 +340,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
                         USBOTGSS_IRQ1_DISCHRGVBUS_FALL |
                         USBOTGSS_IRQ1_IDPULLUP_FALL);
 
-        dwc3_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg);
+        dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg);
 
         ret = platform_device_add_resources(dwc3, pdev->resource,
                         pdev->num_resources);