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> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRXG8GAAoJEIaOsuA1yqREJzYQAKMLW3J/TKTWS1DDuf7qMtMz Ug6qChKZXgT1/QrNjsq2tx4jYIkNdSMtRKiUx0BnIptlUx6gM22gcsN8mXX/UJjC FYAiWl+tYe85e9uayqqt+qVCZjTZCc7St4wQalugDHefvA7yCbiZpSaJRGlJMK+x mePJ7MfrulDsYBXr0u+m2LOJ0qxMDi40k3/UN3aUu5yzrmBiRpVq1mySruvLwGFp Pr6vBnprEc6bW5sRdUR4SICKLvLk5sHwHpvpkzDLYBIb/jXQwbfQri/HKeh4VMk8 trbsvHZyB7H8uuFsCHiBc6VtjcbZ4mxPUK+1PCq8hG077avdkm3ox0BERk9aRTeC jg4mdpyWjgovwi882woPEQXNZoaAXpVDyI8tBRx92a+rGJjXSHhLQI+4Ffi4ZvzV d+q1ZzrHxuzwa/BwcPETY76umXQqXWXg+ap1bHDY0RZFoPLdXMpl583NXGSn3gOD dUlD0UlgYwb75333tRIPNQn3qOx0HVd6MlYPMNzl9t9c9qqfX78AYRny6ZucupRg t9VZ6FO3D2yre9W7u3U3q2c9H7uSAKr/8xaNfvdsIWPncgvvYVIyE8MnR7AiHoPv ZYESs/Gs6w9vUsHa9K4J16Ape7D3AMcGpXUoPUxTBHrwBexzt4j27VWtcL4ns/9r 0kcltUJ4Zq+PIjc7xgxe =aF4r -----END PGP SIGNATURE----- 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>
		
			
				
	
	
		
			341 lines
		
	
	
	
		
			7.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			341 lines
		
	
	
	
		
			7.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
 | 
						|
 * Author: Chao Xie <chao.xie@marvell.com>
 | 
						|
 *        Neil Zhang <zhangwm@marvell.com>
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute  it and/or modify it
 | 
						|
 * under  the terms of  the GNU General  Public License as published by the
 | 
						|
 * Free Software Foundation;  either version 2 of the  License, or (at your
 | 
						|
 * option) any later version.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/platform_device.h>
 | 
						|
#include <linux/clk.h>
 | 
						|
#include <linux/err.h>
 | 
						|
#include <linux/usb/otg.h>
 | 
						|
#include <linux/platform_data/mv_usb.h>
 | 
						|
 | 
						|
#define CAPLENGTH_MASK         (0xff)
 | 
						|
 | 
						|
struct ehci_hcd_mv {
 | 
						|
	struct usb_hcd *hcd;
 | 
						|
 | 
						|
	/* Which mode does this ehci running OTG/Host ? */
 | 
						|
	int mode;
 | 
						|
 | 
						|
	void __iomem *phy_regs;
 | 
						|
	void __iomem *cap_regs;
 | 
						|
	void __iomem *op_regs;
 | 
						|
 | 
						|
	struct usb_phy *otg;
 | 
						|
 | 
						|
	struct mv_usb_platform_data *pdata;
 | 
						|
 | 
						|
	struct clk *clk;
 | 
						|
};
 | 
						|
 | 
						|
static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
 | 
						|
{
 | 
						|
	clk_prepare_enable(ehci_mv->clk);
 | 
						|
}
 | 
						|
 | 
						|
static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
 | 
						|
{
 | 
						|
	clk_disable_unprepare(ehci_mv->clk);
 | 
						|
}
 | 
						|
 | 
						|
static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)
 | 
						|
{
 | 
						|
	int retval;
 | 
						|
 | 
						|
	ehci_clock_enable(ehci_mv);
 | 
						|
	if (ehci_mv->pdata->phy_init) {
 | 
						|
		retval = ehci_mv->pdata->phy_init(ehci_mv->phy_regs);
 | 
						|
		if (retval)
 | 
						|
			return retval;
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void mv_ehci_disable(struct ehci_hcd_mv *ehci_mv)
 | 
						|
{
 | 
						|
	if (ehci_mv->pdata->phy_deinit)
 | 
						|
		ehci_mv->pdata->phy_deinit(ehci_mv->phy_regs);
 | 
						|
	ehci_clock_disable(ehci_mv);
 | 
						|
}
 | 
						|
 | 
						|
static int mv_ehci_reset(struct usb_hcd *hcd)
 | 
						|
{
 | 
						|
	struct device *dev = hcd->self.controller;
 | 
						|
	struct ehci_hcd_mv *ehci_mv = dev_get_drvdata(dev);
 | 
						|
	int retval;
 | 
						|
 | 
						|
	if (ehci_mv == NULL) {
 | 
						|
		dev_err(dev, "Can not find private ehci data\n");
 | 
						|
		return -ENODEV;
 | 
						|
	}
 | 
						|
 | 
						|
	hcd->has_tt = 1;
 | 
						|
 | 
						|
	retval = ehci_setup(hcd);
 | 
						|
	if (retval)
 | 
						|
		dev_err(dev, "ehci_setup failed %d\n", retval);
 | 
						|
 | 
						|
	return retval;
 | 
						|
}
 | 
						|
 | 
						|
static const struct hc_driver mv_ehci_hc_driver = {
 | 
						|
	.description = hcd_name,
 | 
						|
	.product_desc = "Marvell EHCI",
 | 
						|
	.hcd_priv_size = sizeof(struct ehci_hcd),
 | 
						|
 | 
						|
	/*
 | 
						|
	 * generic hardware linkage
 | 
						|
	 */
 | 
						|
	.irq = ehci_irq,
 | 
						|
	.flags = HCD_MEMORY | HCD_USB2,
 | 
						|
 | 
						|
	/*
 | 
						|
	 * basic lifecycle operations
 | 
						|
	 */
 | 
						|
	.reset = mv_ehci_reset,
 | 
						|
	.start = ehci_run,
 | 
						|
	.stop = ehci_stop,
 | 
						|
	.shutdown = ehci_shutdown,
 | 
						|
 | 
						|
	/*
 | 
						|
	 * managing i/o requests and associated device resources
 | 
						|
	 */
 | 
						|
	.urb_enqueue = ehci_urb_enqueue,
 | 
						|
	.urb_dequeue = ehci_urb_dequeue,
 | 
						|
	.endpoint_disable = ehci_endpoint_disable,
 | 
						|
	.endpoint_reset = ehci_endpoint_reset,
 | 
						|
	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
 | 
						|
 | 
						|
	/*
 | 
						|
	 * scheduling support
 | 
						|
	 */
 | 
						|
	.get_frame_number = ehci_get_frame,
 | 
						|
 | 
						|
	/*
 | 
						|
	 * root hub support
 | 
						|
	 */
 | 
						|
	.hub_status_data = ehci_hub_status_data,
 | 
						|
	.hub_control = ehci_hub_control,
 | 
						|
	.bus_suspend = ehci_bus_suspend,
 | 
						|
	.bus_resume = ehci_bus_resume,
 | 
						|
};
 | 
						|
 | 
						|
static int mv_ehci_probe(struct platform_device *pdev)
 | 
						|
{
 | 
						|
	struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
 | 
						|
	struct usb_hcd *hcd;
 | 
						|
	struct ehci_hcd *ehci;
 | 
						|
	struct ehci_hcd_mv *ehci_mv;
 | 
						|
	struct resource *r;
 | 
						|
	int retval = -ENODEV;
 | 
						|
	u32 offset;
 | 
						|
 | 
						|
	if (!pdata) {
 | 
						|
		dev_err(&pdev->dev, "missing platform_data\n");
 | 
						|
		return -ENODEV;
 | 
						|
	}
 | 
						|
 | 
						|
	if (usb_disabled())
 | 
						|
		return -ENODEV;
 | 
						|
 | 
						|
	hcd = usb_create_hcd(&mv_ehci_hc_driver, &pdev->dev, "mv ehci");
 | 
						|
	if (!hcd)
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	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;
 | 
						|
		goto err_put_hcd;
 | 
						|
	}
 | 
						|
 | 
						|
	platform_set_drvdata(pdev, ehci_mv);
 | 
						|
	ehci_mv->pdata = pdata;
 | 
						|
	ehci_mv->hcd = hcd;
 | 
						|
 | 
						|
	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");
 | 
						|
	if (r == NULL) {
 | 
						|
		dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
 | 
						|
		retval = -ENODEV;
 | 
						|
		goto err_clear_drvdata;
 | 
						|
	}
 | 
						|
 | 
						|
	ehci_mv->phy_regs = devm_ioremap(&pdev->dev, r->start,
 | 
						|
					 resource_size(r));
 | 
						|
	if (ehci_mv->phy_regs == 0) {
 | 
						|
		dev_err(&pdev->dev, "failed to map phy I/O memory\n");
 | 
						|
		retval = -EFAULT;
 | 
						|
		goto err_clear_drvdata;
 | 
						|
	}
 | 
						|
 | 
						|
	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "capregs");
 | 
						|
	if (!r) {
 | 
						|
		dev_err(&pdev->dev, "no I/O memory resource defined\n");
 | 
						|
		retval = -ENODEV;
 | 
						|
		goto err_clear_drvdata;
 | 
						|
	}
 | 
						|
 | 
						|
	ehci_mv->cap_regs = devm_ioremap(&pdev->dev, r->start,
 | 
						|
					 resource_size(r));
 | 
						|
	if (ehci_mv->cap_regs == NULL) {
 | 
						|
		dev_err(&pdev->dev, "failed to map I/O memory\n");
 | 
						|
		retval = -EFAULT;
 | 
						|
		goto err_clear_drvdata;
 | 
						|
	}
 | 
						|
 | 
						|
	retval = mv_ehci_enable(ehci_mv);
 | 
						|
	if (retval) {
 | 
						|
		dev_err(&pdev->dev, "init phy error %d\n", retval);
 | 
						|
		goto err_clear_drvdata;
 | 
						|
	}
 | 
						|
 | 
						|
	offset = readl(ehci_mv->cap_regs) & CAPLENGTH_MASK;
 | 
						|
	ehci_mv->op_regs =
 | 
						|
		(void __iomem *) ((unsigned long) ehci_mv->cap_regs + offset);
 | 
						|
 | 
						|
	hcd->rsrc_start = r->start;
 | 
						|
	hcd->rsrc_len = resource_size(r);
 | 
						|
	hcd->regs = ehci_mv->op_regs;
 | 
						|
 | 
						|
	hcd->irq = platform_get_irq(pdev, 0);
 | 
						|
	if (!hcd->irq) {
 | 
						|
		dev_err(&pdev->dev, "Cannot get irq.");
 | 
						|
		retval = -ENODEV;
 | 
						|
		goto err_disable_clk;
 | 
						|
	}
 | 
						|
 | 
						|
	ehci = hcd_to_ehci(hcd);
 | 
						|
	ehci->caps = (struct ehci_caps *) ehci_mv->cap_regs;
 | 
						|
 | 
						|
	ehci_mv->mode = pdata->mode;
 | 
						|
	if (ehci_mv->mode == MV_USB_MODE_OTG) {
 | 
						|
		ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
 | 
						|
		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;
 | 
						|
		}
 | 
						|
 | 
						|
		retval = otg_set_host(ehci_mv->otg->otg, &hcd->self);
 | 
						|
		if (retval < 0) {
 | 
						|
			dev_err(&pdev->dev,
 | 
						|
				"unable to register with transceiver\n");
 | 
						|
			retval = -ENODEV;
 | 
						|
			goto err_disable_clk;
 | 
						|
		}
 | 
						|
		/* otg will enable clock before use as host */
 | 
						|
		mv_ehci_disable(ehci_mv);
 | 
						|
	} else {
 | 
						|
		if (pdata->set_vbus)
 | 
						|
			pdata->set_vbus(1);
 | 
						|
 | 
						|
		retval = usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
 | 
						|
		if (retval) {
 | 
						|
			dev_err(&pdev->dev,
 | 
						|
				"failed to add hcd with err %d\n", retval);
 | 
						|
			goto err_set_vbus;
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	if (pdata->private_init)
 | 
						|
		pdata->private_init(ehci_mv->op_regs, ehci_mv->phy_regs);
 | 
						|
 | 
						|
	dev_info(&pdev->dev,
 | 
						|
		 "successful find EHCI device with regs 0x%p irq %d"
 | 
						|
		 " working in %s mode\n", hcd->regs, hcd->irq,
 | 
						|
		 ehci_mv->mode == MV_USB_MODE_OTG ? "OTG" : "Host");
 | 
						|
 | 
						|
	return 0;
 | 
						|
 | 
						|
err_set_vbus:
 | 
						|
	if (pdata->set_vbus)
 | 
						|
		pdata->set_vbus(0);
 | 
						|
err_disable_clk:
 | 
						|
	mv_ehci_disable(ehci_mv);
 | 
						|
err_clear_drvdata:
 | 
						|
	platform_set_drvdata(pdev, NULL);
 | 
						|
err_put_hcd:
 | 
						|
	usb_put_hcd(hcd);
 | 
						|
 | 
						|
	return retval;
 | 
						|
}
 | 
						|
 | 
						|
static int mv_ehci_remove(struct platform_device *pdev)
 | 
						|
{
 | 
						|
	struct ehci_hcd_mv *ehci_mv = platform_get_drvdata(pdev);
 | 
						|
	struct usb_hcd *hcd = ehci_mv->hcd;
 | 
						|
 | 
						|
	if (hcd->rh_registered)
 | 
						|
		usb_remove_hcd(hcd);
 | 
						|
 | 
						|
	if (!IS_ERR_OR_NULL(ehci_mv->otg))
 | 
						|
		otg_set_host(ehci_mv->otg->otg, NULL);
 | 
						|
 | 
						|
	if (ehci_mv->mode == MV_USB_MODE_HOST) {
 | 
						|
		if (ehci_mv->pdata->set_vbus)
 | 
						|
			ehci_mv->pdata->set_vbus(0);
 | 
						|
 | 
						|
		mv_ehci_disable(ehci_mv);
 | 
						|
	}
 | 
						|
 | 
						|
	platform_set_drvdata(pdev, NULL);
 | 
						|
 | 
						|
	usb_put_hcd(hcd);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
MODULE_ALIAS("mv-ehci");
 | 
						|
 | 
						|
static const struct platform_device_id ehci_id_table[] = {
 | 
						|
	{"pxa-u2oehci", PXA_U2OEHCI},
 | 
						|
	{"pxa-sph", PXA_SPH},
 | 
						|
	{"mmp3-hsic", MMP3_HSIC},
 | 
						|
	{"mmp3-fsic", MMP3_FSIC},
 | 
						|
	{},
 | 
						|
};
 | 
						|
 | 
						|
static void mv_ehci_shutdown(struct platform_device *pdev)
 | 
						|
{
 | 
						|
	struct ehci_hcd_mv *ehci_mv = platform_get_drvdata(pdev);
 | 
						|
	struct usb_hcd *hcd = ehci_mv->hcd;
 | 
						|
 | 
						|
	if (!hcd->rh_registered)
 | 
						|
		return;
 | 
						|
 | 
						|
	if (hcd->driver->shutdown)
 | 
						|
		hcd->driver->shutdown(hcd);
 | 
						|
}
 | 
						|
 | 
						|
static struct platform_driver ehci_mv_driver = {
 | 
						|
	.probe = mv_ehci_probe,
 | 
						|
	.remove = mv_ehci_remove,
 | 
						|
	.shutdown = mv_ehci_shutdown,
 | 
						|
	.driver = {
 | 
						|
		   .name = "mv-ehci",
 | 
						|
		   .bus = &platform_bus_type,
 | 
						|
		   },
 | 
						|
	.id_table = ehci_id_table,
 | 
						|
};
 |