mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
c73cee717e
This patch (as1623) removes the ehci_port_power() routine and all the places that call it. There's no reason for ehci-hcd to change the port power settings; the hub driver takes care of all that stuff. There is one exception: When the controller is resumed from hibernation or following a loss of power, the ports that are supposed to be handed over to a companion controller must be powered on first. Otherwise the handover won't work. This process is not visible to the hub driver, so it has to be handled in ehci-hcd. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
221 lines
5.0 KiB
C
221 lines
5.0 KiB
C
/*
|
|
* Generic platform ehci driver
|
|
*
|
|
* Copyright 2007 Steven Brown <sbrown@cortland.com>
|
|
* Copyright 2010-2012 Hauke Mehrtens <hauke@hauke-m.de>
|
|
*
|
|
* Derived from the ohci-ssb driver
|
|
* Copyright 2007 Michael Buesch <m@bues.ch>
|
|
*
|
|
* Derived from the EHCI-PCI driver
|
|
* Copyright (c) 2000-2004 by David Brownell
|
|
*
|
|
* Derived from the ohci-pci driver
|
|
* Copyright 1999 Roman Weissgaerber
|
|
* Copyright 2000-2002 David Brownell
|
|
* Copyright 1999 Linus Torvalds
|
|
* Copyright 1999 Gregory P. Smith
|
|
*
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
*/
|
|
#include <linux/platform_device.h>
|
|
#include <linux/usb/ehci_pdriver.h>
|
|
|
|
static int ehci_platform_reset(struct usb_hcd *hcd)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(hcd->self.controller);
|
|
struct usb_ehci_pdata *pdata = pdev->dev.platform_data;
|
|
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
|
int retval;
|
|
|
|
hcd->has_tt = pdata->has_tt;
|
|
ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
|
|
ehci->big_endian_desc = pdata->big_endian_desc;
|
|
ehci->big_endian_mmio = pdata->big_endian_mmio;
|
|
|
|
ehci->caps = hcd->regs + pdata->caps_offset;
|
|
retval = ehci_setup(hcd);
|
|
if (retval)
|
|
return retval;
|
|
|
|
if (pdata->no_io_watchdog)
|
|
ehci->need_io_watchdog = 0;
|
|
return 0;
|
|
}
|
|
|
|
static const struct hc_driver ehci_platform_hc_driver = {
|
|
.description = hcd_name,
|
|
.product_desc = "Generic Platform EHCI Controller",
|
|
.hcd_priv_size = sizeof(struct ehci_hcd),
|
|
|
|
.irq = ehci_irq,
|
|
.flags = HCD_MEMORY | HCD_USB2,
|
|
|
|
.reset = ehci_platform_reset,
|
|
.start = ehci_run,
|
|
.stop = ehci_stop,
|
|
.shutdown = ehci_shutdown,
|
|
|
|
.urb_enqueue = ehci_urb_enqueue,
|
|
.urb_dequeue = ehci_urb_dequeue,
|
|
.endpoint_disable = ehci_endpoint_disable,
|
|
.endpoint_reset = ehci_endpoint_reset,
|
|
|
|
.get_frame_number = ehci_get_frame,
|
|
|
|
.hub_status_data = ehci_hub_status_data,
|
|
.hub_control = ehci_hub_control,
|
|
#if defined(CONFIG_PM)
|
|
.bus_suspend = ehci_bus_suspend,
|
|
.bus_resume = ehci_bus_resume,
|
|
#endif
|
|
.relinquish_port = ehci_relinquish_port,
|
|
.port_handed_over = ehci_port_handed_over,
|
|
|
|
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
|
|
};
|
|
|
|
static int __devinit ehci_platform_probe(struct platform_device *dev)
|
|
{
|
|
struct usb_hcd *hcd;
|
|
struct resource *res_mem;
|
|
struct usb_ehci_pdata *pdata = dev->dev.platform_data;
|
|
int irq;
|
|
int err = -ENOMEM;
|
|
|
|
if (!pdata) {
|
|
WARN_ON(1);
|
|
return -ENODEV;
|
|
}
|
|
|
|
if (usb_disabled())
|
|
return -ENODEV;
|
|
|
|
irq = platform_get_irq(dev, 0);
|
|
if (irq < 0) {
|
|
dev_err(&dev->dev, "no irq provided");
|
|
return irq;
|
|
}
|
|
res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
|
if (!res_mem) {
|
|
dev_err(&dev->dev, "no memory resource provided");
|
|
return -ENXIO;
|
|
}
|
|
|
|
if (pdata->power_on) {
|
|
err = pdata->power_on(dev);
|
|
if (err < 0)
|
|
return err;
|
|
}
|
|
|
|
hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev,
|
|
dev_name(&dev->dev));
|
|
if (!hcd) {
|
|
err = -ENOMEM;
|
|
goto err_power;
|
|
}
|
|
|
|
hcd->rsrc_start = res_mem->start;
|
|
hcd->rsrc_len = resource_size(res_mem);
|
|
|
|
hcd->regs = devm_request_and_ioremap(&dev->dev, res_mem);
|
|
if (!hcd->regs) {
|
|
err = -ENOMEM;
|
|
goto err_put_hcd;
|
|
}
|
|
err = usb_add_hcd(hcd, irq, IRQF_SHARED);
|
|
if (err)
|
|
goto err_put_hcd;
|
|
|
|
platform_set_drvdata(dev, hcd);
|
|
|
|
return err;
|
|
|
|
err_put_hcd:
|
|
usb_put_hcd(hcd);
|
|
err_power:
|
|
if (pdata->power_off)
|
|
pdata->power_off(dev);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int __devexit ehci_platform_remove(struct platform_device *dev)
|
|
{
|
|
struct usb_hcd *hcd = platform_get_drvdata(dev);
|
|
struct usb_ehci_pdata *pdata = dev->dev.platform_data;
|
|
|
|
usb_remove_hcd(hcd);
|
|
usb_put_hcd(hcd);
|
|
platform_set_drvdata(dev, NULL);
|
|
|
|
if (pdata->power_off)
|
|
pdata->power_off(dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
static int ehci_platform_suspend(struct device *dev)
|
|
{
|
|
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
|
struct usb_ehci_pdata *pdata = dev->platform_data;
|
|
struct platform_device *pdev =
|
|
container_of(dev, struct platform_device, dev);
|
|
bool do_wakeup = device_may_wakeup(dev);
|
|
int ret;
|
|
|
|
ret = ehci_suspend(hcd, do_wakeup);
|
|
|
|
if (pdata->power_suspend)
|
|
pdata->power_suspend(pdev);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int ehci_platform_resume(struct device *dev)
|
|
{
|
|
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
|
struct usb_ehci_pdata *pdata = dev->platform_data;
|
|
struct platform_device *pdev =
|
|
container_of(dev, struct platform_device, dev);
|
|
|
|
if (pdata->power_on) {
|
|
int err = pdata->power_on(pdev);
|
|
if (err < 0)
|
|
return err;
|
|
}
|
|
|
|
ehci_resume(hcd, false);
|
|
return 0;
|
|
}
|
|
|
|
#else /* !CONFIG_PM */
|
|
#define ehci_platform_suspend NULL
|
|
#define ehci_platform_resume NULL
|
|
#endif /* CONFIG_PM */
|
|
|
|
static const struct platform_device_id ehci_platform_table[] = {
|
|
{ "ehci-platform", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(platform, ehci_platform_table);
|
|
|
|
static const struct dev_pm_ops ehci_platform_pm_ops = {
|
|
.suspend = ehci_platform_suspend,
|
|
.resume = ehci_platform_resume,
|
|
};
|
|
|
|
static struct platform_driver ehci_platform_driver = {
|
|
.id_table = ehci_platform_table,
|
|
.probe = ehci_platform_probe,
|
|
.remove = __devexit_p(ehci_platform_remove),
|
|
.shutdown = usb_hcd_platform_shutdown,
|
|
.driver = {
|
|
.owner = THIS_MODULE,
|
|
.name = "ehci-platform",
|
|
.pm = &ehci_platform_pm_ops,
|
|
}
|
|
};
|