Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Sat, 30 Jan 2010
 10:55:54 -0700
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id o0UHtsc3021481	for
 <andy.sharp@lsi.com>; Sat, 30 Jan 2010 09:55:54 -0800
Received: from psmtp.com (na3sys009amx247.postini.com [74.125.149.131])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id o0UHtrw1017123	for
 <andy.sharp@lsi.com>; Sat, 30 Jan 2010 09:55:53 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx247.postini.com
 ([74.125.148.14]) with SMTP;	Sat, 30 Jan 2010 12:55:53 EST
Received: from localhost.localdomain ([127.0.0.1]:41484 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1492441Ab0A3Rzv (ORCPT
        <rfc822;andy.sharp@lsi.com>); Sat, 30 Jan 2010 18:55:51 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 30 Jan 2010 18:55:33
 +0100 (CET)
Received: from sakura.staff.proxad.net ([213.228.1.107]:38440 "EHLO
        sakura.staff.proxad.net" rhost-flags-OK-OK-OK-OK)        by
 eddie.linux-mips.org with ESMTP id S1493017Ab0A3Ryp (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Sat, 30 Jan 2010 18:54:45 +0100
Received: by sakura.staff.proxad.net (Postfix, from userid 1000)        id
 A111B551085; Sat, 30 Jan 2010 18:54:45 +0100 (CET)
From: Maxime Bizon <mbizon@freebox.fr>
To: David Brownell <dbrownell@users.sourceforge.net>,
	"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>
CC: Ralf Baechle <ralf@linux-mips.org>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, Maxime Bizon <mbizon@freebox.fr>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Sat, 30 Jan 2010 10:54:31 -0700
Subject: [PATCH 2/2] USB: add Broadcom 63xx integrated EHCI controller
 support.
Thread-Topic: [PATCH 2/2] USB: add Broadcom 63xx integrated EHCI controller
 support.
Thread-Index: Acqh1XhTqYeVD37hS3OInEFiN4f5Hw==
Message-ID: <1264874071-28851-3-git-send-email-mbizon@freebox.fr>
References: <1264874071-28851-1-git-send-email-mbizon@freebox.fr>
In-Reply-To: <1264874071-28851-1-git-send-email-mbizon@freebox.fr>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <mbizon@freebox.fr> [22/1] 
x-pstn-neptune: 2/1/0.50/73
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
 drivers/usb/host/ehci-bcm63xx.c |  154 +++++++++++++++++++++++++++++++++++=
++++
 drivers/usb/host/ehci-hcd.c     |    5 +
 2 files changed, 159 insertions(+), 0 deletions(-)
 create mode 100644 drivers/usb/host/ehci-bcm63xx.c

diff --git a/drivers/usb/host/ehci-bcm63xx.c b/drivers/usb/host/ehci-bcm63x=
x.c
new file mode 100644
index 0000000..50638f7
--- /dev/null
+++ b/drivers/usb/host/ehci-bcm63xx.c
@@ -0,0 +1,154 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Pub=
lic
+ * 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/platform_device.h>
+#include <bcm63xx_cpu.h>
+#include <bcm63xx_regs.h>
+#include <bcm63xx_io.h>
+
+static int ehci_bcm63xx_setup(struct usb_hcd *hcd)
+{
+	struct ehci_hcd *ehci =3D hcd_to_ehci(hcd);
+	int retval;
+
+	retval =3D ehci_halt(ehci);
+	if (retval)
+		return retval;
+
+	retval =3D 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 =3D {
+	.description =3D		hcd_name,
+	.product_desc =3D		"BCM63XX integrated EHCI controller",
+	.hcd_priv_size =3D	sizeof(struct ehci_hcd),
+
+	.irq =3D			ehci_irq,
+	.flags =3D		HCD_MEMORY | HCD_USB2,
+
+	.reset =3D		ehci_bcm63xx_setup,
+	.start =3D		ehci_run,
+	.stop =3D			ehci_stop,
+	.shutdown =3D		ehci_shutdown,
+
+	.urb_enqueue =3D		ehci_urb_enqueue,
+	.urb_dequeue =3D		ehci_urb_dequeue,
+	.endpoint_disable =3D	ehci_endpoint_disable,
+
+	.get_frame_number =3D	ehci_get_frame,
+
+	.hub_status_data =3D	ehci_hub_status_data,
+	.hub_control =3D		ehci_hub_control,
+	.bus_suspend =3D		ehci_bus_suspend,
+	.bus_resume =3D		ehci_bus_resume,
+	.relinquish_port =3D	ehci_relinquish_port,
+	.port_handed_over =3D	ehci_port_handed_over,
+};
+
+static int __devinit ehci_hcd_bcm63xx_drv_probe(struct platform_device *pd=
ev)
+{
+	struct resource *res_mem;
+	struct usb_hcd *hcd;
+	struct ehci_hcd *ehci;
+	u32 reg;
+	int ret, irq;
+
+	res_mem =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	irq =3D platform_get_irq(pdev, 0);;
+	if (!res_mem || irq < 0)
+		return -ENODEV;
+
+	reg =3D bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_REG);
+	reg &=3D ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
+	reg |=3D USBH_PRIV_SWAP_EHCI_ENDN_MASK;
+	bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_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_REG);
+
+	hcd =3D usb_create_hcd(&ehci_bcm63xx_hc_driver, &pdev->dev, "bcm63xx");
+	if (!hcd)
+		return -ENOMEM;
+	hcd->rsrc_start =3D res_mem->start;
+	hcd->rsrc_len =3D 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 =3D -EBUSY;
+		goto out;
+	}
+
+	hcd->regs =3D ioremap(hcd->rsrc_start, hcd->rsrc_len);
+	if (!hcd->regs) {
+		pr_debug("ioremap failed\n");
+		ret =3D -EIO;
+		goto out1;
+	}
+
+	ehci =3D hcd_to_ehci(hcd);
+	ehci->big_endian_mmio =3D 1;
+	ehci->big_endian_desc =3D 0;
+	ehci->caps =3D hcd->regs;
+	ehci->regs =3D hcd->regs +
+		HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
+	ehci->hcs_params =3D ehci_readl(ehci, &ehci->caps->hcs_params);
+	ehci->sbrn =3D 0x20;
+
+	ret =3D 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 *p=
dev)
+{
+	struct usb_hcd *hcd;
+
+	hcd =3D 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 =3D {
+	.probe		=3D ehci_hcd_bcm63xx_drv_probe,
+	.remove		=3D __devexit_p(ehci_hcd_bcm63xx_drv_remove),
+	.shutdown	=3D usb_hcd_platform_shutdown,
+	.driver		=3D {
+		.name	=3D "bcm63xx_ehci",
+		.owner	=3D THIS_MODULE,
+	},
+};
+
+MODULE_ALIAS("platform:bcm63xx_ehci");
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 1ec3857..8e7c61e 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
 #define	PLATFORM_DRIVER		ehci_atmel_driver
 #endif
=20
+#ifdef CONFIG_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)
 #error "missing bus glue for ehci-hcd"
--=20
1.6.3.3


