Merge tag 'usb-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

Felipe writes:

usb: patches for v3.10 merge window

Here is the big Gadget & PHY pull request. Many of us have
been really busy lately getting multiple drivers to a better
position.

Since this pull request is so large, I will divide it in sections
so it's easier to grasp what's included.

- cleanups:
	. UDC drivers no longer touch gadget->dev, that's now udc-core
		responsibility
	. Many more UDC drivers converted to usb_gadget_map/unmap_request()
	. UDC drivers no longer initialize DMA-related fields from gadget's
		device structure
	. UDC drivers don't touch gadget.dev.driver directly
	. UDC drivers don't assign gadget.dev.release directly
	. Removal of some unused DMA_ADDR_INVALID
	. Introduction of CONFIG_USB_PHY
	. All phy drivers have been moved to drivers/usb/phy and renamed to
		a common naming scheme
	. Fix PHY layer so it never returns a NULL pointer, also fix all
		callers to avoid using IS_ERR_OR_NULL()
	. Sparse fixes all over the place
	. drivers/usb/otg/ has been deleted
	. Marvel drivers (mv_udc, ehci-mv, mv_otg and mv_u3d) improved clock
		usage

- new features:
	. UDC core now provides a generic way for tracking and reporting
		UDC's state (not attached, resuming, suspended, addressed,
		default, etc)
	. twl4030-usb learned that it shouldn't be enabled during init
	. Full DT support for DWC3 has been implemented
	. ab8500-usb learned about pinctrl framework
	. nop PHY learned about DeviceTree and regulators
	. DWC3 learned about suspend/resume
	. DWC3 can now be compiled in host-only and gadget-only (as well as
		DRD) configurations
	. UVC now enables streaming endpoint based on negotiated speed
	. isp1301 now implements the PHY API properly
	. configfs-based interface for gadget drivers which will lead to
		the removal of all code which just combines functions together
		to build functional gadget drivers.
	. f_serial and f_obex were converted to new configfs interface while
		maintaining old interface around.

- non-critical fixes:
	. UVC gadget driver got fixes for Endpoint usage and stream calculation
	. ab8500-usb fixed unbalanced clock and regulator API usage
	. twl4030-usb got a fix for when OMAP3 is booted with cable connected
	. fusb300_udc got a fix for DMA usage
	. UVC got fixes for two assertions of the USB Video Class Compliance
		specification revision 1.1
	. build warning issues caused by recent addition of __must_check to
		regulator API

These are all changes which deserve a mention, all other changes are related
to these one or minor spelling fixes and other similar tasks.

Signed-of-by: Felipe Balbi <balbi@ti.com>

1 files changed, 63 insertions, 35 deletions

diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index b082bec7343e..a8afe6e26621 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -22,9 +22,9 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/nop-usb-xceiv.h>
 #include <linux/of.h>
+#include <linux/of_platform.h>
 
 struct dwc3_exynos {
-        struct platform_device  *dwc3;
         struct platform_device  *usb2_phy;
         struct platform_device  *usb3_phy;
         struct device           *dev;
@@ -86,21 +86,30 @@ err1:
         return ret;
 }
 
+static int dwc3_exynos_remove_child(struct device *dev, void *unused)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+
+        platform_device_unregister(pdev);
+
+        return 0;
+}
+
 static u64 dwc3_exynos_dma_mask = DMA_BIT_MASK(32);
 
 static int dwc3_exynos_probe(struct platform_device *pdev)
 {
-        struct platform_device  *dwc3;
         struct dwc3_exynos      *exynos;
         struct clk              *clk;
         struct device           *dev = &pdev->dev;
+        struct device_node      *node = dev->of_node;
 
         int                     ret = -ENOMEM;
 
         exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
         if (!exynos) {
                 dev_err(dev, "not enough memory\n");
-                return -ENOMEM;
+                goto err1;
         }
 
         /*
@@ -108,21 +117,15 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
          * Since shared usb code relies on it, set it here for now.
          * Once we move to full device tree support this will vanish off.
          */
-        if (!pdev->dev.dma_mask)
-                pdev->dev.dma_mask = &dwc3_exynos_dma_mask;
+        if (!dev->dma_mask)
+                dev->dma_mask = &dwc3_exynos_dma_mask;
 
         platform_set_drvdata(pdev, exynos);
 
         ret = dwc3_exynos_register_phys(exynos);
         if (ret) {
                 dev_err(dev, "couldn't register PHYs\n");
-                return ret;
-        }
-
-        dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
-        if (!dwc3) {
-                dev_err(dev, "couldn't allocate dwc3 device\n");
-                return -ENOMEM;
+                goto err1;
         }
 
         clk = devm_clk_get(dev, "usbdrd30");
@@ -132,37 +135,28 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
                 goto err1;
         }
 
-        dma_set_coherent_mask(&dwc3->dev, dev->coherent_dma_mask);
-
-        dwc3->dev.parent = dev;
-        dwc3->dev.dma_mask = dev->dma_mask;
-        dwc3->dev.dma_parms = dev->dma_parms;
-        exynos->dwc3    = dwc3;
         exynos->dev     = dev;
         exynos->clk     = clk;
 
-        clk_enable(exynos->clk);
-
-        ret = platform_device_add_resources(dwc3, pdev->resource,
-                        pdev->num_resources);
-        if (ret) {
-                dev_err(dev, "couldn't add resources to dwc3 device\n");
-                goto err2;
-        }
-
-        ret = platform_device_add(dwc3);
-        if (ret) {
-                dev_err(dev, "failed to register dwc3 device\n");
+        clk_prepare_enable(exynos->clk);
+
+        if (node) {
+                ret = of_platform_populate(node, NULL, NULL, dev);
+                if (ret) {
+                        dev_err(dev, "failed to add dwc3 core\n");
+                        goto err2;
+                }
+        } else {
+                dev_err(dev, "no device node, failed to add dwc3 core\n");
+                ret = -ENODEV;
                 goto err2;
         }
 
         return 0;
 
 err2:
-        clk_disable(clk);
+        clk_disable_unprepare(clk);
 err1:
-        platform_device_put(dwc3);
-
         return ret;
 }
 
@@ -170,11 +164,11 @@ static int dwc3_exynos_remove(struct platform_device *pdev)
 {
         struct dwc3_exynos      *exynos = platform_get_drvdata(pdev);
 
-        platform_device_unregister(exynos->dwc3);
         platform_device_unregister(exynos->usb2_phy);
         platform_device_unregister(exynos->usb3_phy);
+        device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child);
 
-        clk_disable(exynos->clk);
+        clk_disable_unprepare(exynos->clk);
 
         return 0;
 }
@@ -187,12 +181,46 @@ static const struct of_device_id exynos_dwc3_match[] = {
 MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
 #endif
 
+#ifdef CONFIG_PM_SLEEP
+static int dwc3_exynos_suspend(struct device *dev)
+{
+        struct dwc3_exynos *exynos = dev_get_drvdata(dev);
+
+        clk_disable(exynos->clk);
+
+        return 0;
+}
+
+static int dwc3_exynos_resume(struct device *dev)
+{
+        struct dwc3_exynos *exynos = dev_get_drvdata(dev);
+
+        clk_enable(exynos->clk);
+
+        /* runtime set active to reflect active state. */
+        pm_runtime_disable(dev);
+        pm_runtime_set_active(dev);
+        pm_runtime_enable(dev);
+
+        return 0;
+}
+
+static const struct dev_pm_ops dwc3_exynos_dev_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(dwc3_exynos_suspend, dwc3_exynos_resume)
+};
+
+#define DEV_PM_OPS      (&dwc3_exynos_dev_pm_ops)
+#else
+#define DEV_PM_OPS      NULL
+#endif /* CONFIG_PM_SLEEP */
+
 static struct platform_driver dwc3_exynos_driver = {
         .probe          = dwc3_exynos_probe,
         .remove         = dwc3_exynos_remove,
         .driver         = {
                 .name   = "exynos-dwc3",
                 .of_match_table = of_match_ptr(exynos_dwc3_match),
+                .pm     = DEV_PM_OPS,
         },
 };