brcm47xx: add new usb driver for bcma bus and replace ssb usb driver.

This new usb driver uses an extra device so the ehci and the ohci driver are not depending on ech other any more.

SVN-Revision: 29575

1 files changed, 321 insertions, 0 deletions

diff --git a/target/linux/brcm47xx/patches-3.0/0033-USB-Add-driver-for-the-ssb-bus.patch b/target/linux/brcm47xx/patches-3.0/0033-USB-Add-driver-for-the-ssb-bus.patch
new file mode 100644
index 0000000..866540b
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.0/0033-USB-Add-driver-for-the-ssb-bus.patch
@@ -0,0 +1,321 @@
+From b61e70ad9080a6dbd3731917ec21dbcbb9d382a2 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sat, 26 Nov 2011 21:35:17 +0100
+Subject: [PATCH 20/21] USB: Add driver for the ssb bus
+
+This adds a USB driver using the generic platform device driver for the
+USB controller found on the Broadcom ssb bus. The ssb bus just
+exposes one device which serves the OHCI and the EHCI controller at the
+same time. This driver probes for this USB controller and creates and
+registers two new platform devices which will be probed by the new
+generic platform device driver. This makes it possible to use the EHCI
+and the OCHI controller on the ssb bus at the same time.
+
+The old ssb OHCI USB driver will be removed in the next step as this
+driver also provide an OHCI driver and an EHCI for the cores supporting
+it.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ drivers/usb/host/Kconfig   |   12 ++
+ drivers/usb/host/Makefile  |    1 +
+ drivers/usb/host/ssb-hcd.c |  320 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 333 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/usb/host/ssb-hcd.c
+
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -610,3 +610,15 @@ config USB_HCD_BCMA
+ 	  for ehci and ohci.
+ 
+ 	  If unsure, say N.
++
++config USB_HCD_SSB
++	tristate "SSB usb host driver"
++	depends on SSB && EXPERIMENTAL
++	select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
++	select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
++	help
++	  Enbale support for the EHCI and OCHI host controller on an bcma bus.
++	  It converts the bcma driver into two platform device drivers
++	  for ehci and ohci.
++
++	  If unsure, say N.
+--- a/drivers/usb/host/Makefile
++++ b/drivers/usb/host/Makefile
+@@ -36,3 +36,4 @@ obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd
+ obj-$(CONFIG_USB_FSL_MPH_DR_OF)	+= fsl-mph-dr-of.o
+ obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
+ obj-$(CONFIG_USB_HCD_BCMA)	+= bcma-hcd.o
++obj-$(CONFIG_USB_HCD_SSB)	+= ssb-hcd.o
+--- /dev/null
++++ b/drivers/usb/host/ssb-hcd.c
+@@ -0,0 +1,268 @@
++/*
++ * Sonics Silicon Backplane
++ * Broadcom USB-core driver  (SSB bus glue)
++ *
++ * Copyright 2011 Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Based on ssb-ohci driver
++ * Copyright 2007 Michael Buesch <m@bues.ch>
++ *
++ * Derived from the OHCI-PCI driver
++ * Copyright 1999 Roman Weissgaerber
++ * Copyright 2000-2002 David Brownell
++ * Copyright 1999 Linus Torvalds
++ * Copyright 1999 Gregory P. Smith
++ *
++ * Derived from the USBcore related parts of Broadcom-SB
++ * Copyright 2005-2011 Broadcom Corporation
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++#include <linux/ssb/ssb.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/module.h>
++
++MODULE_AUTHOR("Hauke Mehrtens");
++MODULE_DESCRIPTION("Common USB driver for SSB Bus");
++MODULE_LICENSE("GPL");
++
++#define SSB_HCD_TMSLOW_HOSTMODE	(1 << 29)
++
++struct ssb_hcd_device {
++	struct platform_device *ehci_dev;
++	struct platform_device *ohci_dev;
++
++	u32 enable_flags;
++};
++
++/* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */
++static u32 ssb_hcd_init_chip(struct ssb_device *dev)
++{
++	u32 tmp, flags = 0;
++
++	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
++		/* Put the device into host-mode. */
++		flags |= SSB_HCD_TMSLOW_HOSTMODE;
++		ssb_device_enable(dev, flags);
++	} else if (dev->id.coreid == SSB_DEV_USB20_HOST) {
++		/*
++		 * USB 2.0 special considerations:
++		 *
++		 * In addition to the standard SSB reset sequence, the Host
++		 * Control Register must be programmed to bring the USB core
++		 * and various phy components out of reset.
++		 */
++		ssb_device_enable(dev, 0);
++		ssb_write32(dev, 0x200, 0x7ff);
++
++		/* Change Flush control reg */
++		tmp = ssb_read32(dev, 0x400);
++		tmp &= ~8;
++		ssb_write32(dev, 0x400, tmp);
++		tmp = ssb_read32(dev, 0x400);
++
++		/* Change Shim control reg */
++		tmp = ssb_read32(dev, 0x304);
++		tmp &= ~0x100;
++		ssb_write32(dev, 0x304, tmp);
++		tmp = ssb_read32(dev, 0x304);
++
++		udelay(1);
++
++		/* Work around for 5354 failures */
++		if (dev->id.revision == 2 && dev->bus->chip_id == 0x5354) {
++			/* Change syn01 reg */
++			tmp = 0x00fe00fe;
++			ssb_write32(dev, 0x894, tmp);
++
++			/* Change syn03 reg */
++			tmp = ssb_read32(dev, 0x89c);
++			tmp |= 0x1;
++			ssb_write32(dev, 0x89c, tmp);
++		}
++	} else
++		ssb_device_enable(dev, 0);
++
++	return flags;
++}
++
++static struct platform_device *ssb_hcd_create_pdev(struct ssb_device *dev,
++						   char *name, u32 addr,
++						   u32 len)
++{
++	struct platform_device *hci_dev;
++	struct resource *hci_res;
++	int ret = -ENOMEM;
++
++	hci_res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
++	if (!hci_res)
++		return ERR_PTR(-ENOMEM);
++
++	hci_res[0].start = addr;
++	hci_res[0].end = hci_res[0].start + len - 1;
++	hci_res[0].flags = IORESOURCE_MEM;
++
++	hci_res[1].start = dev->irq;
++	hci_res[1].flags = IORESOURCE_IRQ;
++
++	hci_dev = platform_device_alloc(name, 0);
++	if (!hci_dev)
++		goto err_alloc;
++
++	hci_dev->dev.parent = dev->dev;
++	hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask;
++
++	ret = platform_device_add_resources(hci_dev, hci_res, 2);
++	if (ret)
++		goto err_alloc;
++
++	ret = platform_device_add(hci_dev);
++	if (ret) {
++err_alloc:
++		kfree(hci_res);
++		platform_device_put(hci_dev);
++		return ERR_PTR(ret);
++	}
++
++	return hci_dev;
++}
++
++static int ssb_hcd_probe(struct ssb_device *dev, const struct ssb_device_id *id)
++{
++	int err, tmp;
++	int start, len;
++	u16 chipid_top;
++	struct ssb_hcd_device *usb_dev;
++
++	/* USBcores are only connected on embedded devices. */
++	chipid_top = (dev->bus->chip_id & 0xFF00);
++	if (chipid_top != 0x4700 && chipid_top != 0x5300)
++		return -ENODEV;
++
++	/* TODO: Probably need checks here; is the core connected? */
++
++	if (dma_set_mask(dev->dma_dev, DMA_BIT_MASK(32)) ||
++	    dma_set_coherent_mask(dev->dma_dev, DMA_BIT_MASK(32)))
++		return -EOPNOTSUPP;
++
++	usb_dev = kzalloc(sizeof(struct ssb_hcd_device), GFP_KERNEL);
++	if (!usb_dev)
++		return -ENOMEM;
++
++	/* We currently always attach SSB_DEV_USB11_HOSTDEV
++	 * as HOST OHCI. If we want to attach it as Client device,
++	 * we must branch here and call into the (yet to
++	 * be written) Client mode driver. Same for remove(). */
++	usb_dev->enable_flags = ssb_hcd_init_chip(dev);
++
++	tmp = ssb_read32(dev, SSB_ADMATCH0);
++
++	start = ssb_admatch_base(tmp);
++	len = ssb_admatch_size(tmp);
++	usb_dev->ohci_dev = ssb_hcd_create_pdev(dev, "ohci-platform", start,
++						len);
++	if (IS_ERR(usb_dev->ohci_dev)) {
++		err = PTR_ERR(usb_dev->ohci_dev);
++		goto err_free_usb_dev;
++	}
++
++	if (dev->id.coreid == SSB_DEV_USB20_HOST) {
++		start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */
++		len = 0x100; /* ehci reg block size */
++		usb_dev->ehci_dev = ssb_hcd_create_pdev(dev, "ehci-platform",
++							start, len);
++		if (IS_ERR(usb_dev->ehci_dev)) {
++			err = PTR_ERR(usb_dev->ehci_dev);
++			goto err_unregister_ohci_dev;
++		}
++	}
++
++	ssb_set_drvdata(dev, usb_dev);
++	return 0;
++
++err_unregister_ohci_dev:
++	platform_device_unregister(usb_dev->ohci_dev);
++err_free_usb_dev:
++	kfree(usb_dev);
++	return err;
++}
++
++static void ssb_hcd_remove(struct ssb_device *dev)
++{
++	struct ssb_hcd_device *usb_dev;
++	struct platform_device *ohci_dev;
++	struct platform_device *ehci_dev;
++
++	usb_dev = ssb_get_drvdata(dev);
++	if (!usb_dev)
++		return;
++
++	ohci_dev = usb_dev->ohci_dev;
++	ehci_dev = usb_dev->ehci_dev;
++
++	if (ohci_dev) {
++		platform_device_unregister(ohci_dev);
++	}
++	if (ehci_dev) {
++		platform_device_unregister(ehci_dev);
++	}
++
++	ssb_device_disable(dev, 0);
++}
++
++static void ssb_hcd_shutdown(struct ssb_device *dev)
++{
++	ssb_device_disable(dev, 0);
++}
++
++#ifdef CONFIG_PM
++
++static int ssb_hcd_suspend(struct ssb_device *dev, pm_message_t state)
++{
++	ssb_device_disable(dev, 0);
++
++	return 0;
++}
++
++static int ssb_hcd_resume(struct ssb_device *dev)
++{
++	ssb_device_enable(dev, usb_dev->enable_flags);
++
++	return 0;
++}
++
++#else /* !CONFIG_PM */
++#define ssb_hcd_suspend	NULL
++#define ssb_hcd_resume	NULL
++#endif /* CONFIG_PM */
++
++static const struct ssb_device_id ssb_hcd_table[] = {
++	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
++	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
++	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
++	SSB_DEVTABLE_END
++};
++MODULE_DEVICE_TABLE(ssb, ssb_hcd_table);
++
++static struct ssb_driver ssb_hcd_driver = {
++	.name		= KBUILD_MODNAME,
++	.id_table	= ssb_hcd_table,
++	.probe		= ssb_hcd_probe,
++	.remove		= ssb_hcd_remove,
++	.shutdown	= ssb_hcd_shutdown,
++	.suspend	= ssb_hcd_suspend,
++	.resume		= ssb_hcd_resume,
++};
++
++static int __init ssb_hcd_init(void)
++{
++	return ssb_driver_register(&ssb_hcd_driver);
++}
++module_init(ssb_hcd_init);
++
++static void __exit ssb_hcd_exit(void)
++{
++	ssb_driver_unregister(&ssb_hcd_driver);
++}
++module_exit(ssb_hcd_exit);