mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
ehci driver cleanup
SVN-Revision: 13441
This commit is contained in:
parent
043562037f
commit
05184c7c38
@ -15,17 +15,13 @@
|
|||||||
extern int usb_disabled(void);
|
extern int usb_disabled(void);
|
||||||
|
|
||||||
static void ar71xx_start_ehci(struct platform_device *pdev)
|
static void ar71xx_start_ehci(struct platform_device *pdev)
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ar71xx_stop_ehci(struct platform_device *pdev)
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* TODO: implement
|
* TODO: implement
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
int usb_ehci_ar71xx_probe(const struct hc_driver *driver,
|
static int usb_ehci_ar71xx_probe(const struct hc_driver *driver,
|
||||||
struct usb_hcd **hcd_out,
|
struct usb_hcd **hcd_out,
|
||||||
struct platform_device *pdev)
|
struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
@ -70,48 +66,33 @@ int usb_ehci_ar71xx_probe(const struct hc_driver *driver,
|
|||||||
goto err_release_region;
|
goto err_release_region;
|
||||||
}
|
}
|
||||||
|
|
||||||
ar71xx_start_ehci(pdev);
|
|
||||||
|
|
||||||
ehci = hcd_to_ehci(hcd);
|
ehci = hcd_to_ehci(hcd);
|
||||||
ehci->caps = hcd->regs;
|
ehci->caps = hcd->regs;
|
||||||
ehci->regs = hcd->regs + HC_LENGTH(readl(&ehci->caps->hc_capbase));
|
ehci->regs = hcd->regs + HC_LENGTH(readl(&ehci->caps->hc_capbase));
|
||||||
ehci->hcs_params = readl(&ehci->caps->hcs_params);
|
ehci->hcs_params = readl(&ehci->caps->hcs_params);
|
||||||
|
|
||||||
|
ar71xx_start_ehci(pdev);
|
||||||
|
|
||||||
ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
|
ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_stop_ehc;
|
goto err_iounmap;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_stop_ehc:
|
err_iounmap:
|
||||||
ar71xx_stop_ehci(pdev);
|
|
||||||
iounmap(hcd->regs);
|
iounmap(hcd->regs);
|
||||||
|
|
||||||
err_release_region:
|
err_release_region:
|
||||||
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
||||||
err_put_hcd:
|
err_put_hcd:
|
||||||
usb_put_hcd(hcd);
|
usb_put_hcd(hcd);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* may be called without controller electrically present */
|
|
||||||
/* may be called with controller, bus, and devices active */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* usb_ehci_ar71xx_remove - shutdown processing for AR71xx-based HCDs
|
|
||||||
* @dev: USB Host Controller being removed
|
|
||||||
* Context: !in_interrupt()
|
|
||||||
*
|
|
||||||
* Reverses the effect of usb_hcd_ar71xx_probe(), first invoking
|
|
||||||
* the HCD's stop() method. It is always called from a thread
|
|
||||||
* context, normally "rmmod", "apmd", or something similar.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
static void usb_ehci_ar71xx_remove(struct usb_hcd *hcd,
|
static void usb_ehci_ar71xx_remove(struct usb_hcd *hcd,
|
||||||
struct platform_device *pdev)
|
struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
usb_remove_hcd(hcd);
|
usb_remove_hcd(hcd);
|
||||||
ar71xx_stop_ehci(pdev);
|
|
||||||
iounmap(hcd->regs);
|
iounmap(hcd->regs);
|
||||||
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
||||||
usb_put_hcd(hcd);
|
usb_put_hcd(hcd);
|
||||||
@ -121,6 +102,7 @@ static const struct hc_driver ehci_ar71xx_hc_driver = {
|
|||||||
.description = hcd_name,
|
.description = hcd_name,
|
||||||
.product_desc = "Atheros AR71xx built-in EHCI controller",
|
.product_desc = "Atheros AR71xx built-in EHCI controller",
|
||||||
.hcd_priv_size = sizeof(struct ehci_hcd),
|
.hcd_priv_size = sizeof(struct ehci_hcd),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* generic hardware linkage
|
* generic hardware linkage
|
||||||
*/
|
*/
|
||||||
@ -181,11 +163,9 @@ static int ehci_hcd_ar71xx_drv_remove(struct platform_device *pdev)
|
|||||||
static struct platform_driver ehci_hcd_ar71xx_driver = {
|
static struct platform_driver ehci_hcd_ar71xx_driver = {
|
||||||
.probe = ehci_hcd_ar71xx_drv_probe,
|
.probe = ehci_hcd_ar71xx_drv_probe,
|
||||||
.remove = ehci_hcd_ar71xx_drv_remove,
|
.remove = ehci_hcd_ar71xx_drv_remove,
|
||||||
.shutdown = usb_hcd_platform_shutdown,
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "ar71xx-ehci",
|
.name = "ar71xx-ehci",
|
||||||
.bus = &platform_bus_type
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
MODULE_ALIAS("ar71xx-ehci");
|
MODULE_ALIAS("platform:ar71xx-ehci");
|
||||||
|
Loading…
Reference in New Issue
Block a user