X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f241cac466e5041027d5513b68c932a5b438698f..76d9192b8d573fe02b4a708bbb6d4a200562b85a:/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 c8bf20154..01433c2fb 100644 --- a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c +++ b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c @@ -1,7 +1,7 @@ /* * Bus Glue for Atheros AR71xx built-in EHCI controller. * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2010 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * Parts of this file are based on Atheros' 2.6.15 BSP @@ -19,11 +19,52 @@ extern int usb_disabled(void); -static void ehci_ar71xx_setup(void) +static int ehci_ar71xx_init(struct usb_hcd *hcd) { - /* - * TODO: implement - */ + 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 int ehci_ar91xx_init(struct usb_hcd *hcd) +{ + 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; } static int ehci_ar71xx_probe(const struct hc_driver *driver, @@ -31,7 +72,6 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver, struct platform_device *pdev) { struct usb_hcd *hcd; - struct ehci_hcd *ehci; struct resource *res; int irq; int ret; @@ -39,7 +79,7 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver, res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { dev_dbg(&pdev->dev, "no IRQ specified for %s\n", - pdev->dev.bus_id); + dev_name(&pdev->dev)); return -ENODEV; } irq = res->start; @@ -47,11 +87,11 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver, 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); + dev_name(&pdev->dev)); return -ENODEV; } - hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id); + hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev)); if (!hcd) return -ENOMEM; @@ -71,14 +111,6 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver, goto err_release_region; } - 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_ar71xx_setup(); - ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); if (ret) goto err_iounmap; @@ -109,51 +141,86 @@ static const struct hc_driver ehci_ar71xx_hc_driver = { .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, + .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, + .endpoint_reset = ehci_endpoint_reset, + + .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, + + .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, +}; + +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, - /* - * 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, - /* - * scheduling support - */ .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, + + .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, }; static int ehci_ar71xx_driver_probe(struct platform_device *pdev) { + struct ar71xx_ehci_platform_data *pdata; struct usb_hcd *hcd = NULL; + int ret; if (usb_disabled()) return -ENODEV; - return ehci_ar71xx_probe(&ehci_ar71xx_hc_driver, &hcd, pdev); + pdata = pdev->dev.platform_data; + if (!pdata) { + dev_err(&pdev->dev, "no platform data specified for %s\n", + dev_name(&pdev->dev)); + 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_ar71xx_driver_remove(struct platform_device *pdev)