X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a14fb1a48530b525bc81ca1172a0775a9628cb78..b80c50f7cfaf56f2d6587caa7dbdba87cce83293:/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c diff --git a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c index ea31e5b2b..c8bf20154 100644 --- a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c +++ b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c @@ -1,33 +1,34 @@ /* - * EHCI HCD (Host Controller Driver) for USB. + * Bus Glue for Atheros AR71xx built-in EHCI controller. * - * Copyright (C) 2007 Atheros Communications, Inc. - * Copyright (C) 2008 Gabor Juhos - * Copyright (C) 2008 Imre Kaloz + * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008 Imre Kaloz * - * Bus Glue for Atheros AR71xx built-in EHCI controller + * Parts of this file are based on Atheros' 2.6.15 BSP + * Copyright (C) 2007 Atheros Communications, Inc. * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. */ #include #include -extern int usb_disabled(void); +#include -static void ar71xx_start_ehci(struct platform_device *pdev) -{ -} +extern int usb_disabled(void); -static void ar71xx_stop_ehci(struct platform_device *pdev) +static void ehci_ar71xx_setup(void) { /* * TODO: implement */ } -int usb_ehci_ar71xx_probe(const struct hc_driver *driver, - struct usb_hcd **hcd_out, - struct platform_device *pdev) +static int ehci_ar71xx_probe(const struct hc_driver *driver, + struct usb_hcd **hcd_out, + struct platform_device *pdev) { struct usb_hcd *hcd; struct ehci_hcd *ehci; @@ -43,17 +44,17 @@ int usb_ehci_ar71xx_probe(const struct hc_driver *driver, } irq = res->start; - hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id); - if (!hcd) - return -ENOMEM; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_dbg(&pdev->dev, "no base address specified for %s\n", pdev->dev.bus_id); - ret = -ENODEV; - goto err_put_hcd; + return -ENODEV; } + + hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id); + if (!hcd) + return -ENOMEM; + hcd->rsrc_start = res->start; hcd->rsrc_len = res->end - res->start + 1; @@ -70,70 +71,57 @@ int usb_ehci_ar71xx_probe(const struct hc_driver *driver, goto err_release_region; } - ar71xx_start_ehci(pdev); + ehci = hcd_to_ehci(hcd); + ehci->caps = hcd->regs; + ehci->regs = hcd->regs + + HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase)); + ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); - ehci = hcd_to_ehci(hcd); - ehci->caps = hcd->regs; - ehci->regs = hcd->regs + HC_LENGTH(readl(&ehci->caps->hc_capbase)); - ehci->hcs_params = readl(&ehci->caps->hcs_params); + ehci_ar71xx_setup(); ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); if (ret) - goto err_stop_ehc; + goto err_iounmap; return 0; -err_stop_ehc: - ar71xx_stop_ehci(pdev); + err_iounmap: iounmap(hcd->regs); -err_release_region: + err_release_region: release_mem_region(hcd->rsrc_start, hcd->rsrc_len); -err_put_hcd: + err_put_hcd: usb_put_hcd(hcd); 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, - struct platform_device *pdev) +static void ehci_ar71xx_remove(struct usb_hcd *hcd, + struct platform_device *pdev) { usb_remove_hcd(hcd); - ar71xx_stop_ehci(pdev); iounmap(hcd->regs); release_mem_region(hcd->rsrc_start, hcd->rsrc_len); usb_put_hcd(hcd); } static const struct hc_driver ehci_ar71xx_hc_driver = { - .description = hcd_name, - .product_desc = "Atheros AR71xx built-in EHCI controller", - .hcd_priv_size = sizeof(struct ehci_hcd), + .description = hcd_name, + .product_desc = "Atheros AR71xx built-in EHCI controller", + .hcd_priv_size = sizeof(struct ehci_hcd), + /* * generic hardware linkage */ - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, + .irq = ehci_irq, + .flags = HCD_MEMORY | HCD_USB2, /* * basic lifecycle operations */ - .reset = ehci_init, - .start = ehci_run, - .stop = ehci_stop, - .shutdown = ehci_shutdown, + .reset = ehci_init, + .start = ehci_run, + .stop = ehci_stop, + .shutdown = ehci_shutdown, /* * managing i/o requests and associated device resources @@ -145,7 +133,7 @@ static const struct hc_driver ehci_ar71xx_hc_driver = { /* * scheduling support */ - .get_frame_number = ehci_get_frame, + .get_frame_number = ehci_get_frame, /* * root hub support @@ -158,34 +146,30 @@ static const struct hc_driver ehci_ar71xx_hc_driver = { #endif }; -static int ehci_hcd_ar71xx_drv_probe(struct platform_device *pdev) +static int ehci_ar71xx_driver_probe(struct platform_device *pdev) { struct usb_hcd *hcd = NULL; - int ret; - ret = -ENODEV; - if (!usb_disabled()) - ret = usb_ehci_ar71xx_probe(&ehci_ar71xx_hc_driver, &hcd, pdev); + if (usb_disabled()) + return -ENODEV; - return ret; + return ehci_ar71xx_probe(&ehci_ar71xx_hc_driver, &hcd, pdev); } -static int ehci_hcd_ar71xx_drv_remove(struct platform_device *pdev) +static int ehci_ar71xx_driver_remove(struct platform_device *pdev) { struct usb_hcd *hcd = platform_get_drvdata(pdev); - usb_ehci_ar71xx_remove(hcd, pdev); + ehci_ar71xx_remove(hcd, pdev); return 0; } -static struct platform_driver ehci_hcd_ar71xx_driver = { - .probe = ehci_hcd_ar71xx_drv_probe, - .remove = ehci_hcd_ar71xx_drv_remove, - .shutdown = usb_hcd_platform_shutdown, +MODULE_ALIAS("platform:ar71xx-ehci"); + +static struct platform_driver ehci_ar71xx_driver = { + .probe = ehci_ar71xx_driver_probe, + .remove = ehci_ar71xx_driver_remove, .driver = { .name = "ar71xx-ehci", - .bus = &platform_bus_type } }; - -MODULE_ALIAS("ar71xx-ehci");