X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d8297bb0a4e520c83175a987ff70e4a72f2bd603..63da6d7324456ec171cc1b6b3341a58b4d20fc6a:/target/linux/brcm63xx/patches-2.6.27/008-usb_ehci_support.patch?ds=inline diff --git a/target/linux/brcm63xx/patches-2.6.27/008-usb_ehci_support.patch b/target/linux/brcm63xx/patches-2.6.27/008-usb_ehci_support.patch index 9ae03b787..243b650b6 100644 --- a/target/linux/brcm63xx/patches-2.6.27/008-usb_ehci_support.patch +++ b/target/linux/brcm63xx/patches-2.6.27/008-usb_ehci_support.patch @@ -17,234 +17,9 @@ Signed-off-by: Maxime Bizon create mode 100644 drivers/usb/host/ehci-bcm63xx.c create mode 100644 include/asm-mips/mach-bcm63xx/bcm63xx_dev_usb_ehci.h ---- a/arch/mips/bcm63xx/Kconfig -+++ b/arch/mips/bcm63xx/Kconfig -@@ -14,4 +14,6 @@ config BCM63XX_CPU_6358 - select USB_ARCH_HAS_OHCI - select USB_OHCI_BIG_ENDIAN_DESC - select USB_OHCI_BIG_ENDIAN_MMIO -+ select USB_ARCH_HAS_EHCI -+ select USB_EHCI_BIG_ENDIAN_MMIO - endmenu ---- a/arch/mips/bcm63xx/Makefile -+++ b/arch/mips/bcm63xx/Makefile -@@ -2,4 +2,5 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o - obj-y += dev-uart.o - obj-y += dev-pcmcia.o - obj-y += dev-usb-ohci.o -+obj-y += dev-usb-ehci.o - obj-$(CONFIG_EARLY_PRINTK) += early_printk.o ---- /dev/null -+++ b/arch/mips/bcm63xx/dev-usb-ehci.c -@@ -0,0 +1,50 @@ -+/* -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file "COPYING" in the main directory of this archive -+ * for more details. -+ * -+ * Copyright (C) 2008 Maxime Bizon -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+static struct resource ehci_resources[] = { -+ { -+ .start = -1, /* filled at runtime */ -+ .end = -1, /* filled at runtime */ -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = -1, /* filled at runtime */ -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static u64 ehci_dmamask = ~(u32)0; -+ -+static struct platform_device bcm63xx_ehci_device = { -+ .name = "bcm63xx_ehci", -+ .id = 0, -+ .num_resources = ARRAY_SIZE(ehci_resources), -+ .resource = ehci_resources, -+ .dev = { -+ .dma_mask = &ehci_dmamask, -+ .coherent_dma_mask = 0xffffffff, -+ }, -+}; -+ -+int __init bcm63xx_ehci_register(void) -+{ -+ if (!BCMCPU_IS_6358()) -+ return 0; -+ -+ ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0); -+ ehci_resources[0].end = ehci_resources[0].start; -+ ehci_resources[0].end += RSET_EHCI_SIZE - 1; -+ ehci_resources[1].start = bcm63xx_get_irq_number(IRQ_EHCI0); -+ return platform_device_register(&bcm63xx_ehci_device); -+} ---- /dev/null -+++ b/drivers/usb/host/ehci-bcm63xx.c -@@ -0,0 +1,152 @@ -+/* -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file "COPYING" in the main directory of this archive -+ * for more details. -+ * -+ * Copyright (C) 2008 Maxime Bizon -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+static int ehci_bcm63xx_setup(struct usb_hcd *hcd) -+{ -+ struct ehci_hcd *ehci = hcd_to_ehci(hcd); -+ int retval; -+ -+ retval = ehci_halt(ehci); -+ if (retval) -+ return retval; -+ -+ retval = ehci_init(hcd); -+ if (retval) -+ return retval; -+ -+ hcd->has_tt = 1; -+ ehci_reset(ehci); -+ ehci_port_power(ehci, 0); -+ -+ return retval; -+} -+ -+ -+static const struct hc_driver ehci_bcm63xx_hc_driver = { -+ .description = hcd_name, -+ .product_desc = "BCM63XX integrated EHCI controller", -+ .hcd_priv_size = sizeof(struct ehci_hcd), -+ -+ .irq = ehci_irq, -+ .flags = HCD_MEMORY | HCD_USB2, -+ -+ .reset = ehci_bcm63xx_setup, -+ .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, -+ .bus_suspend = ehci_bus_suspend, -+ .bus_resume = ehci_bus_resume, -+ .relinquish_port = ehci_relinquish_port, -+ .port_handed_over = ehci_port_handed_over, -+}; -+ -+static int __devinit ehci_hcd_bcm63xx_drv_probe(struct platform_device *pdev) -+{ -+ struct resource *res_mem, *res_irq; -+ struct usb_hcd *hcd; -+ struct ehci_hcd *ehci; -+ u32 reg; -+ int ret; -+ -+ res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); -+ if (!res_mem || !res_irq) -+ return -ENODEV; -+ -+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_REG); -+ reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK; -+ reg |= USBH_PRIV_SWAP_EHCI_ENDN_MASK; -+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_REG); -+ -+ /* don't ask... */ -+ bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, USBH_PRIV_TEST_REG); -+ -+ hcd = usb_create_hcd(&ehci_bcm63xx_hc_driver, &pdev->dev, "bcm63xx"); -+ if (!hcd) -+ return -ENOMEM; -+ hcd->rsrc_start = res_mem->start; -+ hcd->rsrc_len = res_mem->end - res_mem->start + 1; -+ -+ if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { -+ pr_debug("request_mem_region failed\n"); -+ ret = -EBUSY; -+ goto out; -+ } -+ -+ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); -+ if (!hcd->regs) { -+ pr_debug("ioremap failed\n"); -+ ret = -EIO; -+ goto out1; -+ } -+ -+ ehci = hcd_to_ehci(hcd); -+ ehci->big_endian_mmio = 1; -+ ehci->big_endian_desc = 0; -+ 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; -+ -+ ret = usb_add_hcd(hcd, res_irq->start, IRQF_DISABLED); -+ if (ret) -+ goto out2; -+ -+ platform_set_drvdata(pdev, hcd); -+ return 0; -+ -+out2: -+ iounmap(hcd->regs); -+out1: -+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len); -+out: -+ usb_put_hcd(hcd); -+ return ret; -+} -+ -+static int __devexit ehci_hcd_bcm63xx_drv_remove(struct platform_device *pdev) -+{ -+ struct usb_hcd *hcd; -+ -+ hcd = platform_get_drvdata(pdev); -+ usb_remove_hcd(hcd); -+ iounmap(hcd->regs); -+ usb_put_hcd(hcd); -+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len); -+ platform_set_drvdata(pdev, NULL); -+ return 0; -+} -+ -+static struct platform_driver ehci_hcd_bcm63xx_driver = { -+ .probe = ehci_hcd_bcm63xx_drv_probe, -+ .remove = __devexit_p(ehci_hcd_bcm63xx_drv_remove), -+ .shutdown = usb_hcd_platform_shutdown, -+ .driver = { -+ .name = "bcm63xx_ehci", -+ .owner = THIS_MODULE, -+ .bus = &platform_bus_type -+ }, -+}; -+ -+MODULE_ALIAS("platform:bcm63xx_ehci"); --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1040,6 +1040,11 @@ MODULE_LICENSE ("GPL"); +@@ -1039,6 +1039,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ixp4xx_ehci_driver #endif @@ -270,12 +45,3 @@ Signed-off-by: Maxime Bizon static inline unsigned int ehci_readl(const struct ehci_hcd *ehci, __u32 __iomem * regs) { ---- /dev/null -+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_dev_usb_ehci.h -@@ -0,0 +1,6 @@ -+#ifndef BCM63XX_DEV_USB_EHCI_H_ -+#define BCM63XX_DEV_USB_EHCI_H_ -+ -+int bcm63xx_ehci_register(void); -+ -+#endif /* BCM63XX_DEV_USB_EHCI_H_ */