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, 19 insertions, 35 deletions

diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 5cd9f96ed92d..402062973f03 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -33,25 +33,17 @@ struct ehci_hcd_mv {
 
         struct mv_usb_platform_data *pdata;
 
-        /* clock source and total clock number */
-        unsigned int clknum;
-        struct clk *clk[0];
+        struct clk *clk;
 };
 
 static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
 {
-        unsigned int i;
-
-        for (i = 0; i < ehci_mv->clknum; i++)
-                clk_prepare_enable(ehci_mv->clk[i]);
+        clk_prepare_enable(ehci_mv->clk);
 }
 
 static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
 {
-        unsigned int i;
-
-        for (i = 0; i < ehci_mv->clknum; i++)
-                clk_disable_unprepare(ehci_mv->clk[i]);
+        clk_disable_unprepare(ehci_mv->clk);
 }
 
 static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)
@@ -144,9 +136,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
         struct ehci_hcd *ehci;
         struct ehci_hcd_mv *ehci_mv;
         struct resource *r;
-        int clk_i, retval = -ENODEV;
+        int retval = -ENODEV;
         u32 offset;
-        size_t size;
 
         if (!pdata) {
                 dev_err(&pdev->dev, "missing platform_data\n");
@@ -160,8 +151,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
         if (!hcd)
                 return -ENOMEM;
 
-        size = sizeof(*ehci_mv) + sizeof(struct clk *) * pdata->clknum;
-        ehci_mv = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
+        ehci_mv = devm_kzalloc(&pdev->dev, sizeof(*ehci_mv), GFP_KERNEL);
         if (ehci_mv == NULL) {
                 dev_err(&pdev->dev, "cannot allocate ehci_hcd_mv\n");
                 retval = -ENOMEM;
@@ -172,16 +162,11 @@ static int mv_ehci_probe(struct platform_device *pdev)
         ehci_mv->pdata = pdata;
         ehci_mv->hcd = hcd;
 
-        ehci_mv->clknum = pdata->clknum;
-        for (clk_i = 0; clk_i < ehci_mv->clknum; clk_i++) {
-                ehci_mv->clk[clk_i] =
-                    devm_clk_get(&pdev->dev, pdata->clkname[clk_i]);
-                if (IS_ERR(ehci_mv->clk[clk_i])) {
-                        dev_err(&pdev->dev, "error get clck \"%s\"\n",
-                                pdata->clkname[clk_i]);
-                        retval = PTR_ERR(ehci_mv->clk[clk_i]);
-                        goto err_clear_drvdata;
-                }
+        ehci_mv->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(ehci_mv->clk)) {
+                dev_err(&pdev->dev, "error getting clock\n");
+                retval = PTR_ERR(ehci_mv->clk);
+                goto err_clear_drvdata;
         }
 
         r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phyregs");
@@ -240,12 +225,16 @@ static int mv_ehci_probe(struct platform_device *pdev)
 
         ehci_mv->mode = pdata->mode;
         if (ehci_mv->mode == MV_USB_MODE_OTG) {
-#ifdef CONFIG_USB_OTG_UTILS
                 ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-                if (IS_ERR_OR_NULL(ehci_mv->otg)) {
-                        dev_err(&pdev->dev,
-                                "unable to find transceiver\n");
-                        retval = -ENODEV;
+                if (IS_ERR(ehci_mv->otg)) {
+                        retval = PTR_ERR(ehci_mv->otg);
+
+                        if (retval == -ENXIO)
+                                dev_info(&pdev->dev, "MV_USB_MODE_OTG "
+                                                "must have CONFIG_USB_PHY enabled\n");
+                        else
+                                dev_err(&pdev->dev,
+                                                "unable to find transceiver\n");
                         goto err_disable_clk;
                 }
 
@@ -258,11 +247,6 @@ static int mv_ehci_probe(struct platform_device *pdev)
                 }
                 /* otg will enable clock before use as host */
                 mv_ehci_disable(ehci_mv);
-#else
-                dev_info(&pdev->dev, "MV_USB_MODE_OTG "
-                         "must have CONFIG_USB_OTG_UTILS enabled\n");
-                goto err_disable_clk;
-#endif
         } else {
                 if (pdata->set_vbus)
                         pdata->set_vbus(1);