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

Pull USB updates from Greg KH:
 "Here's the big USB 3.11-rc1 merge request.

  Lots of gadget and finally, chipidea driver updates (they were much
  needed), along with a new host controller driver, lots of little
  serial driver fixes, the removal of the 255 usb-serial device
  limitation, and a variety of other minor things.

  All of these have been in the linux-next releases for a while"

* tag 'usb-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (254 commits)
  usb: musb: omap2430: make it compile again
  usb: chipidea: ci_hdrc_imx: access phy via private data
  xhci: Add missing unlocks on error paths
  USB: option,qcserial: move Novatel Gobi1K IDs to qcserial
  ehci-atmel.c: prepare clk before calling enable
  USB: ohci-at91: prepare clk before calling enable
  USB: HWA: fix device probe failure
  wusbcore: add entries in Documentation/ABI for new wusbhc sysfs attributes
  wusbcore: add sysfs attribute for retry count
  wusbcore: add sysfs attribute for DNTS count and interval
  usb: chipidea: drop "13xxx" infix
  usb: phy: tegra: remove duplicated include from phy-tegra-usb.c
  usb: host: xhci-plat: release mem region while removing module
  usbmisc_imx: allow autoloading on according to dt ids
  usb: fix build error without CONFIG_USB_PHY
  usb: check usb_hub_to_struct_hub() return value
  xhci: check for failed dma pool allocation
  usb: gadget: f_subset: fix missing unlock on error in geth_alloc()
  usb: gadget: f_ncm: fix missing unlock on error in ncm_alloc()
  usb: gadget: f_ecm: fix missing unlock on error in ecm_alloc()
  ...

1 files changed, 49 insertions, 13 deletions

diff --git a/drivers/usb/phy/phy-samsung-usb2.c b/drivers/usb/phy/phy-samsung-usb2.c
index 9d5e273abcc7..1011c16ade7e 100644
--- a/drivers/usb/phy/phy-samsung-usb2.c
+++ b/drivers/usb/phy/phy-samsung-usb2.c
@@ -176,6 +176,11 @@ static void samsung_usb2phy_enable(struct samsung_usbphy *sphy)
                 phypwr &= ~PHYPWR_NORMAL_MASK;
                 rstcon |= RSTCON_SWRST;
                 break;
+        case TYPE_EXYNOS4X12:
+                phypwr &= ~(PHYPWR_NORMAL_MASK_HSIC0 |
+                                PHYPWR_NORMAL_MASK_HSIC1 |
+                                PHYPWR_NORMAL_MASK_PHY1);
+                rstcon |= RSTCON_HOSTPHY_SWRST;
         case TYPE_EXYNOS4210:
                 phypwr &= ~PHYPWR_NORMAL_MASK_PHY0;
                 rstcon |= RSTCON_SWRST;
@@ -189,6 +194,8 @@ static void samsung_usb2phy_enable(struct samsung_usbphy *sphy)
         /* reset all ports of PHY and Link */
         writel(rstcon, regs + SAMSUNG_RSTCON);
         udelay(10);
+        if (sphy->drv_data->cpu_type == TYPE_EXYNOS4X12)
+                rstcon &= ~RSTCON_HOSTPHY_SWRST;
         rstcon &= ~RSTCON_SWRST;
         writel(rstcon, regs + SAMSUNG_RSTCON);
 }
@@ -239,6 +246,10 @@ static void samsung_usb2phy_disable(struct samsung_usbphy *sphy)
         case TYPE_S3C64XX:
                 phypwr |= PHYPWR_NORMAL_MASK;
                 break;
+        case TYPE_EXYNOS4X12:
+                phypwr |= (PHYPWR_NORMAL_MASK_HSIC0 |
+                                PHYPWR_NORMAL_MASK_HSIC1 |
+                                PHYPWR_NORMAL_MASK_PHY1);
         case TYPE_EXYNOS4210:
                 phypwr |= PHYPWR_NORMAL_MASK_PHY0;
         default:
@@ -284,17 +295,14 @@ static int samsung_usb2phy_init(struct usb_phy *phy)
         /* Disable phy isolation */
         if (sphy->plat && sphy->plat->pmu_isolation)
                 sphy->plat->pmu_isolation(false);
-        else
-                samsung_usbphy_set_isolation(sphy, false);
+        else if (sphy->drv_data->set_isolation)
+                sphy->drv_data->set_isolation(sphy, false);
 
         /* Selecting Host/OTG mode; After reset USB2.0PHY_CFG: HOST */
         samsung_usbphy_cfg_sel(sphy);
 
         /* Initialize usb phy registers */
-        if (sphy->drv_data->cpu_type == TYPE_EXYNOS5250)
-                samsung_exynos5_usb2phy_enable(sphy);
-        else
-                samsung_usb2phy_enable(sphy);
+        sphy->drv_data->phy_enable(sphy);
 
         spin_unlock_irqrestore(&sphy->lock, flags);
 
@@ -334,16 +342,13 @@ static void samsung_usb2phy_shutdown(struct usb_phy *phy)
         }
 
         /* De-initialize usb phy registers */
-        if (sphy->drv_data->cpu_type == TYPE_EXYNOS5250)
-                samsung_exynos5_usb2phy_disable(sphy);
-        else
-                samsung_usb2phy_disable(sphy);
+        sphy->drv_data->phy_disable(sphy);
 
         /* Enable phy isolation */
         if (sphy->plat && sphy->plat->pmu_isolation)
                 sphy->plat->pmu_isolation(true);
-        else
-                samsung_usbphy_set_isolation(sphy, true);
+        else if (sphy->drv_data->set_isolation)
+                sphy->drv_data->set_isolation(sphy, true);
 
         spin_unlock_irqrestore(&sphy->lock, flags);
 
@@ -408,7 +413,10 @@ static int samsung_usb2phy_probe(struct platform_device *pdev)
         sphy->phy.label         = "samsung-usb2phy";
         sphy->phy.init          = samsung_usb2phy_init;
         sphy->phy.shutdown      = samsung_usb2phy_shutdown;
-        sphy->ref_clk_freq      = samsung_usbphy_get_refclk_freq(sphy);
+
+        sphy->ref_clk_freq = samsung_usbphy_get_refclk_freq(sphy);
+        if (sphy->ref_clk_freq < 0)
+                return -EINVAL;
 
         sphy->phy.otg           = otg;
         sphy->phy.otg->phy      = &sphy->phy;
@@ -438,18 +446,40 @@ static int samsung_usb2phy_remove(struct platform_device *pdev)
 static const struct samsung_usbphy_drvdata usb2phy_s3c64xx = {
         .cpu_type               = TYPE_S3C64XX,
         .devphy_en_mask         = S3C64XX_USBPHY_ENABLE,
+        .rate_to_clksel         = samsung_usbphy_rate_to_clksel_64xx,
+        .set_isolation          = NULL, /* TODO */
+        .phy_enable             = samsung_usb2phy_enable,
+        .phy_disable            = samsung_usb2phy_disable,
 };
 
 static const struct samsung_usbphy_drvdata usb2phy_exynos4 = {
         .cpu_type               = TYPE_EXYNOS4210,
         .devphy_en_mask         = EXYNOS_USBPHY_ENABLE,
         .hostphy_en_mask        = EXYNOS_USBPHY_ENABLE,
+        .rate_to_clksel         = samsung_usbphy_rate_to_clksel_64xx,
+        .set_isolation          = samsung_usbphy_set_isolation_4210,
+        .phy_enable             = samsung_usb2phy_enable,
+        .phy_disable            = samsung_usb2phy_disable,
+};
+
+static const struct samsung_usbphy_drvdata usb2phy_exynos4x12 = {
+        .cpu_type               = TYPE_EXYNOS4X12,
+        .devphy_en_mask         = EXYNOS_USBPHY_ENABLE,
+        .hostphy_en_mask        = EXYNOS_USBPHY_ENABLE,
+        .rate_to_clksel         = samsung_usbphy_rate_to_clksel_4x12,
+        .set_isolation          = samsung_usbphy_set_isolation_4210,
+        .phy_enable             = samsung_usb2phy_enable,
+        .phy_disable            = samsung_usb2phy_disable,
 };
 
 static struct samsung_usbphy_drvdata usb2phy_exynos5 = {
         .cpu_type               = TYPE_EXYNOS5250,
         .hostphy_en_mask        = EXYNOS_USBPHY_ENABLE,
         .hostphy_reg_offset     = EXYNOS_USBHOST_PHY_CTRL_OFFSET,
+        .rate_to_clksel         = samsung_usbphy_rate_to_clksel_4x12,
+        .set_isolation          = samsung_usbphy_set_isolation_4210,
+        .phy_enable             = samsung_exynos5_usb2phy_enable,
+        .phy_disable            = samsung_exynos5_usb2phy_disable,
 };
 
 #ifdef CONFIG_OF
@@ -461,6 +491,9 @@ static const struct of_device_id samsung_usbphy_dt_match[] = {
                 .compatible = "samsung,exynos4210-usb2phy",
                 .data = &usb2phy_exynos4,
         }, {
+                .compatible = "samsung,exynos4x12-usb2phy",
+                .data = &usb2phy_exynos4x12,
+        }, {
                 .compatible = "samsung,exynos5250-usb2phy",
                 .data = &usb2phy_exynos5
         },
@@ -477,6 +510,9 @@ static struct platform_device_id samsung_usbphy_driver_ids[] = {
                 .name           = "exynos4210-usb2phy",
                 .driver_data    = (unsigned long)&usb2phy_exynos4,
         }, {
+                .name           = "exynos4x12-usb2phy",
+                .driver_data    = (unsigned long)&usb2phy_exynos4x12,
+        }, {
                 .name           = "exynos5250-usb2phy",
                 .driver_data    = (unsigned long)&usb2phy_exynos5,
         },