X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/546b5ed544503182a9b3e981bc11feebd6042b21..63151d3b34738ab38919029a9b89927a8982b0f6:/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c?ds=inline 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 6c7f29f6c..1c05a64c5 100644 --- a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c +++ b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c @@ -1,36 +1,77 @@ /* - * 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 +#include + extern int usb_disabled(void); -static void ar71xx_start_ehci(struct platform_device *pdev) +static int ehci_ar71xx_init(struct usb_hcd *hcd) { + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + int ret; + + 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->sbrn = 0x20; + ehci->has_synopsys_hc_bug = 1; + + ehci_reset(ehci); + + ret = ehci_init(hcd); + if (ret) + return ret; + + ehci_port_power(ehci, 0); + + return 0; } -static void ar71xx_stop_ehci(struct platform_device *pdev) +static int ehci_ar91xx_init(struct usb_hcd *hcd) { - /* - * TODO: implement - */ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + int ret; + + ehci->caps = hcd->regs + 0x100; + ehci->regs = hcd->regs + 0x100 + + HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase)); + ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); + + hcd->has_tt = 1; + ehci->sbrn = 0x20; + + ehci_reset(ehci); + + ret = ehci_init(hcd); + if (ret) + return ret; + + ehci_port_power(ehci, 0); + + return 0; } -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; struct resource *res; int irq; int ret; @@ -43,17 +84,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,124 +111,126 @@ int usb_ehci_ar71xx_probe(const struct hc_driver *driver, goto err_release_region; } - ar71xx_start_ehci(pdev); - -#if 0 - 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); -#endif - 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), - /* - * generic hardware linkage - */ - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, - - /* - * basic lifecycle operations - */ - .reset = ehci_init, - .start = ehci_run, - .stop = ehci_stop, - .shutdown = ehci_shutdown, - - /* - * managing i/o requests and associated device resources - */ + .description = hcd_name, + .product_desc = "Atheros AR71xx built-in EHCI controller", + .hcd_priv_size = sizeof(struct ehci_hcd), + + .irq = ehci_irq, + .flags = HCD_MEMORY | HCD_USB2, + + .reset = ehci_ar71xx_init, + .start = ehci_run, + .stop = ehci_stop, + .shutdown = ehci_shutdown, + .urb_enqueue = ehci_urb_enqueue, .urb_dequeue = ehci_urb_dequeue, .endpoint_disable = ehci_endpoint_disable, - /* - * scheduling support - */ - .get_frame_number = ehci_get_frame, + .get_frame_number = ehci_get_frame, - /* - * root hub support - */ .hub_status_data = ehci_hub_status_data, .hub_control = ehci_hub_control, #ifdef CONFIG_PM .hub_suspend = ehci_hub_suspend, .hub_resume = ehci_hub_resume, #endif + .relinquish_port = ehci_relinquish_port, + .port_handed_over = ehci_port_handed_over, }; -static int ehci_hcd_ar71xx_drv_probe(struct platform_device *pdev) +static const struct hc_driver ehci_ar91xx_hc_driver = { + .description = hcd_name, + .product_desc = "Atheros AR91xx built-in EHCI controller", + .hcd_priv_size = sizeof(struct ehci_hcd), + .irq = ehci_irq, + .flags = HCD_MEMORY | HCD_USB2, + + .reset = ehci_ar91xx_init, + .start = ehci_run, + .stop = ehci_stop, + .shutdown = ehci_shutdown, + + .urb_enqueue = ehci_urb_enqueue, + .urb_dequeue = ehci_urb_dequeue, + .endpoint_disable = ehci_endpoint_disable, + + .get_frame_number = ehci_get_frame, + + .hub_status_data = ehci_hub_status_data, + .hub_control = ehci_hub_control, +#ifdef CONFIG_PM + .hub_suspend = ehci_hub_suspend, + .hub_resume = ehci_hub_resume, +#endif + .relinquish_port = ehci_relinquish_port, + .port_handed_over = ehci_port_handed_over, +}; + +static int ehci_ar71xx_driver_probe(struct platform_device *pdev) { + struct ar71xx_ehci_platform_data *pdata; 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; + + pdata = pdev->dev.platform_data; + if (!pdata) { + dev_err(&pdev->dev, "no platform data specified for %s\n", + pdev->dev.bus_id); + return -ENODEV; + } + + if (pdata->is_ar91xx) + ret = ehci_ar71xx_probe(&ehci_ar91xx_hc_driver, &hcd, pdev); + else + ret = ehci_ar71xx_probe(&ehci_ar71xx_hc_driver, &hcd, pdev); return ret; } -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");