brcm47xx: add support for kernel 3.2

SVN-Revision: 29756

1 files changed, 291 insertions, 0 deletions

diff --git a/target/linux/brcm47xx/patches-3.2/0030-USB-OHCI-Add-a-generic-platform-device-driver.patch b/target/linux/brcm47xx/patches-3.2/0030-USB-OHCI-Add-a-generic-platform-device-driver.patch
new file mode 100644
index 0000000000..4aeaa78aa4
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.2/0030-USB-OHCI-Add-a-generic-platform-device-driver.patch
@@ -0,0 +1,291 @@
+From 14297ee700e1c2e04a35466304f9a3c5e1387146 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sat, 26 Nov 2011 21:20:54 +0100
+Subject: [PATCH 17/30] USB: OHCI: Add a generic platform device driver
+
+This adds a generic driver for platform devices. It works like the PCI
+driver and is based on it. This is for devices which do not have an own
+bus but their OHCI controller works like a PCI controller. It will be
+used for the Broadcom bcma and ssb USB OHCI controller.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ drivers/usb/host/Kconfig         |   10 ++
+ drivers/usb/host/ohci-hcd.c      |   21 ++++-
+ drivers/usb/host/ohci-platform.c |  197 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 227 insertions(+), 1 deletions(-)
+ create mode 100644 drivers/usb/host/ohci-platform.c
+
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -378,6 +378,16 @@ config USB_CNS3XXX_OHCI
+ 	  Enable support for the CNS3XXX SOC's on-chip OHCI controller.
+ 	  It is needed for low-speed USB 1.0 device support.
+ 
++config USB_OHCI_HCD_PLATFORM
++	bool "OHCI driver for a platform device"
++	depends on USB_OHCI_HCD && EXPERIMENTAL
++	default n
++	---help---
++	  Adds an OHCI host driver for a generic platform device, which
++	  provieds a memory space and an irq.
++
++	  If unsure, say N.
++
+ config USB_OHCI_BIG_ENDIAN_DESC
+ 	bool
+ 	depends on USB_OHCI_HCD
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1116,6 +1116,11 @@ MODULE_LICENSE ("GPL");
+ #define PLATFORM_DRIVER		ohci_xls_driver
+ #endif
+ 
++#ifdef CONFIG_USB_OHCI_HCD_PLATFORM
++#include "ohci-platform.c"
++#define PLATFORM_OHCI_DRIVER	ohci_platform_driver
++#endif
++
+ #if	!defined(PCI_DRIVER) &&		\
+ 	!defined(PLATFORM_DRIVER) &&	\
+ 	!defined(OMAP1_PLATFORM_DRIVER) &&	\
+@@ -1125,7 +1130,8 @@ MODULE_LICENSE ("GPL");
+ 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
+ 	!defined(SM501_OHCI_DRIVER) && \
+ 	!defined(TMIO_OHCI_DRIVER) && \
+-	!defined(SSB_OHCI_DRIVER)
++	!defined(SSB_OHCI_DRIVER) && \
++	!defined(PLATFORM_OHCI_DRIVER)
+ #error "missing bus glue for ohci-hcd"
+ #endif
+ 
+@@ -1209,9 +1215,19 @@ static int __init ohci_hcd_mod_init(void
+ 		goto error_tmio;
+ #endif
+ 
++#ifdef PLATFORM_OHCI_DRIVER
++	retval = platform_driver_register(&PLATFORM_OHCI_DRIVER);
++	if (retval)
++		goto error_platform;
++#endif
++
+ 	return retval;
+ 
+ 	/* Error path */
++#ifdef PLATFORM_OHCI_DRIVER
++	platform_driver_unregister(&PLATFORM_OHCI_DRIVER);
++ error_platform:
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+ 	platform_driver_unregister(&TMIO_OHCI_DRIVER);
+  error_tmio:
+@@ -1265,6 +1281,9 @@ module_init(ohci_hcd_mod_init);
+ 
+ static void __exit ohci_hcd_mod_exit(void)
+ {
++#ifdef PLATFORM_OHCI_DRIVER
++	platform_driver_unregister(&PLATFORM_OHCI_DRIVER);
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+ 	platform_driver_unregister(&TMIO_OHCI_DRIVER);
+ #endif
+--- /dev/null
++++ b/drivers/usb/host/ohci-platform.c
+@@ -0,0 +1,197 @@
++/*
++ * Generic platform ohci driver
++ *
++ * Copyright 2007 Michael Buesch <m@bues.ch>
++ * Copyright 2011 Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Derived from the OHCI-PCI driver
++ * Copyright 1999 Roman Weissgaerber
++ * Copyright 2000-2002 David Brownell
++ * Copyright 1999 Linus Torvalds
++ * Copyright 1999 Gregory P. Smith
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++#include <linux/platform_device.h>
++
++static int ohci_platform_reset(struct usb_hcd *hcd)
++{
++	struct ohci_hcd *ohci = hcd_to_ohci(hcd);
++	int err;
++
++	ohci_hcd_init(ohci);
++	err = ohci_init(ohci);
++
++	return err;
++}
++
++static int ohci_platform_start(struct usb_hcd *hcd)
++{
++	struct ohci_hcd *ohci = hcd_to_ohci(hcd);
++	int err;
++
++	err = ohci_run(ohci);
++	if (err < 0) {
++		ohci_err(ohci, "can't start\n");
++		ohci_stop(hcd);
++	}
++
++	return err;
++}
++
++static const struct hc_driver ohci_platform_hc_driver = {
++	.description		= "platform-usb-ohci",
++	.product_desc		= "Generic Platform OHCI Controller",
++	.hcd_priv_size		= sizeof(struct ohci_hcd),
++
++	.irq			= ohci_irq,
++	.flags			= HCD_MEMORY | HCD_USB11,
++
++	.reset			= ohci_platform_reset,
++	.start			= ohci_platform_start,
++	.stop			= ohci_stop,
++	.shutdown		= ohci_shutdown,
++
++	.urb_enqueue		= ohci_urb_enqueue,
++	.urb_dequeue		= ohci_urb_dequeue,
++	.endpoint_disable	= ohci_endpoint_disable,
++
++	.get_frame_number	= ohci_get_frame,
++
++	.hub_status_data	= ohci_hub_status_data,
++	.hub_control		= ohci_hub_control,
++#ifdef	CONFIG_PM
++	.bus_suspend		= ohci_bus_suspend,
++	.bus_resume		= ohci_bus_resume,
++#endif
++
++	.start_port_reset	= ohci_start_port_reset,
++};
++
++static int ohci_platform_attach(struct platform_device *dev)
++{
++	struct usb_hcd *hcd;
++	struct resource *res_irq, *res_mem;
++	int err = -ENOMEM;
++
++	hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
++			dev_name(&dev->dev));
++	if (!hcd)
++		goto err_return;
++
++	res_irq = platform_get_resource(dev, IORESOURCE_IRQ, 0);
++	if (!res_irq) {
++		err = -ENXIO;
++		goto err_return;
++	}
++	res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
++	if (!res_mem) {
++		err = -ENXIO;
++		goto err_return;
++	}
++	hcd->rsrc_start = res_mem->start;
++	hcd->rsrc_len = res_mem->end - res_mem->start + 1;
++
++	hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
++	if (!hcd->regs)
++		goto err_put_hcd;
++	err = usb_add_hcd(hcd, res_irq->start, IRQF_SHARED);
++	if (err)
++		goto err_iounmap;
++
++	platform_set_drvdata(dev, hcd);
++
++	return err;
++
++err_iounmap:
++	iounmap(hcd->regs);
++err_put_hcd:
++	usb_put_hcd(hcd);
++err_return:
++	return err;
++}
++
++static int ohci_platform_probe(struct platform_device *dev)
++{
++	int err;
++
++	if (usb_disabled())
++		return -ENODEV;
++
++	/* We currently always attach BCMA_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(). */
++
++	err = ohci_platform_attach(dev);
++
++	return err;
++}
++
++static int ohci_platform_remove(struct platform_device *dev)
++{
++	struct usb_hcd *hcd;
++
++	hcd = platform_get_drvdata(dev);
++	if (!hcd)
++		return -ENODEV;
++
++	usb_remove_hcd(hcd);
++	iounmap(hcd->regs);
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++	usb_put_hcd(hcd);
++
++	return 0;
++}
++
++static void ohci_platform_shutdown(struct platform_device *dev)
++{
++	struct usb_hcd *hcd;
++
++	hcd = platform_get_drvdata(dev);
++	if (!hcd)
++		return;
++
++	if (hcd->driver->shutdown)
++		hcd->driver->shutdown(hcd);
++}
++
++#ifdef CONFIG_PM
++
++static int ohci_platform_suspend(struct platform_device *dev,
++				 pm_message_t state)
++{
++
++	return 0;
++}
++
++static int ohci_platform_resume(struct platform_device *dev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(dev);
++
++	ohci_finish_controller_resume(hcd);
++	return 0;
++}
++
++#else /* !CONFIG_PM */
++#define ohci_platform_suspend	NULL
++#define ohci_platform_resume	NULL
++#endif /* CONFIG_PM */
++
++static const struct platform_device_id ohci_platform_table[] = {
++	{ "ohci-platform", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(platform, ohci_platform_table);
++
++static struct platform_driver ohci_platform_driver = {
++	.id_table	= ohci_platform_table,
++	.probe		= ohci_platform_probe,
++	.remove		= ohci_platform_remove,
++	.shutdown	= ohci_platform_shutdown,
++	.suspend	= ohci_platform_suspend,
++	.resume		= ohci_platform_resume,
++	.driver		= {
++		.name	= "ohci-platform",
++	}
++};