mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 23:58:05 +03:00
fixes overcurrent warning spam on 3.3 kernels for bcm63xx again. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32221 3c298f89-4303-0410-b956-a3cf2f4a3e73
242 lines
6.5 KiB
Diff
242 lines
6.5 KiB
Diff
From db58271d5152aa1d3894fdef13ca04379139d5d9 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Bizon <mbizon@freebox.fr>
|
|
Date: Fri, 10 Jun 2011 19:15:47 +0200
|
|
Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller.
|
|
|
|
---
|
|
drivers/usb/host/Kconfig | 10 ++-
|
|
drivers/usb/host/ehci-bcm63xx.c | 186 +++++++++++++++++++++++++++++++++++++++
|
|
drivers/usb/host/ehci-hcd.c | 5 +
|
|
3 files changed, 199 insertions(+), 1 deletions(-)
|
|
create mode 100644 drivers/usb/host/ehci-bcm63xx.c
|
|
|
|
--- a/drivers/usb/host/Kconfig
|
|
+++ b/drivers/usb/host/Kconfig
|
|
@@ -106,7 +106,7 @@ config USB_EHCI_BIG_ENDIAN_MMIO
|
|
depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || \
|
|
ARCH_IXP4XX || XPS_USB_HCD_XILINX || \
|
|
PPC_MPC512x || CPU_CAVIUM_OCTEON || \
|
|
- PMC_MSP || SPARC_LEON)
|
|
+ PMC_MSP || SPARC_LEON || BCM63XX)
|
|
default y
|
|
|
|
config USB_EHCI_BIG_ENDIAN_DESC
|
|
@@ -129,6 +129,14 @@ config XPS_USB_HCD_XILINX
|
|
config USB_FSL_MPH_DR_OF
|
|
tristate
|
|
|
|
+config USB_EHCI_BCM63XX
|
|
+ bool "Support for Broadcom 63xx on-chip EHCI USB controller"
|
|
+ depends on USB_EHCI_HCD && BCM63XX
|
|
+ select USB_EHCI_BIG_ENDIAN_MMIO
|
|
+ ---help---
|
|
+ Enables support for the on-chip EHCI controller on
|
|
+ BCM6358 and later chips.
|
|
+
|
|
config USB_EHCI_FSL
|
|
bool "Support for Freescale PPC on-chip EHCI USB controller"
|
|
depends on USB_EHCI_HCD && FSL_SOC
|
|
--- /dev/null
|
|
+++ b/drivers/usb/host/ehci-bcm63xx.c
|
|
@@ -0,0 +1,186 @@
|
|
+/*
|
|
+ * 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 <mbizon@freebox.fr>
|
|
+ */
|
|
+
|
|
+#include <linux/init.h>
|
|
+#include <linux/clk.h>
|
|
+#include <linux/platform_device.h>
|
|
+#include <bcm63xx_cpu.h>
|
|
+#include <bcm63xx_regs.h>
|
|
+#include <bcm63xx_io.h>
|
|
+
|
|
+static struct clk *usb_host_clock;
|
|
+
|
|
+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;
|
|
+
|
|
+ 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;
|
|
+ struct usb_hcd *hcd;
|
|
+ struct ehci_hcd *ehci;
|
|
+ struct clk *clk;
|
|
+ u32 reg;
|
|
+ int ret, irq;
|
|
+
|
|
+ res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
+ irq = platform_get_irq(pdev, 0);;
|
|
+ if (!res_mem || irq < 0)
|
|
+ return -ENODEV;
|
|
+
|
|
+ /* enable USB host clock */
|
|
+ clk = clk_get(&pdev->dev, "usbh");
|
|
+ if (IS_ERR(clk))
|
|
+ return -ENODEV;
|
|
+
|
|
+ clk_enable(clk);
|
|
+ usb_host_clock = clk;
|
|
+ msleep(100);
|
|
+
|
|
+ if (BCMCPU_IS_6358()) {
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6358_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_6358_REG);
|
|
+
|
|
+ /*
|
|
+ * The magic value comes for the original vendor BSP
|
|
+ * and is needed for USB to work. Datasheet does not
|
|
+ * help, so the magic value is used as-is.
|
|
+ */
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
|
|
+ USBH_PRIV_TEST_6358_REG);
|
|
+
|
|
+ } else if (BCMCPU_IS_6368()) {
|
|
+
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_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_6368_REG);
|
|
+
|
|
+ reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
|
|
+ reg |= USBH_PRIV_SETUP_IOC_MASK;
|
|
+ bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_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, ehci_readl(ehci, &ehci->caps->hc_capbase));
|
|
+ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
|
|
+ ehci->sbrn = 0x20;
|
|
+ ehci->ignore_oc = 1;
|
|
+
|
|
+ ret = usb_add_hcd(hcd, irq, 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);
|
|
+ if (usb_host_clock) {
|
|
+ clk_disable(usb_host_clock);
|
|
+ clk_put(usb_host_clock);
|
|
+ }
|
|
+ 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,
|
|
+ },
|
|
+};
|
|
+
|
|
+MODULE_ALIAS("platform:bcm63xx_ehci");
|
|
--- a/drivers/usb/host/ehci-hcd.c
|
|
+++ b/drivers/usb/host/ehci-hcd.c
|
|
@@ -1381,6 +1381,11 @@ MODULE_LICENSE ("GPL");
|
|
#define PLATFORM_DRIVER ehci_mv_driver
|
|
#endif
|
|
|
|
+#ifdef CONFIG_USB_EHCI_BCM63XX
|
|
+#include "ehci-bcm63xx.c"
|
|
+#define PLATFORM_DRIVER ehci_hcd_bcm63xx_driver
|
|
+#endif
|
|
+
|
|
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
|
|
!defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
|
|
!defined(XILINX_OF_PLATFORM_DRIVER)
|