From: Florian Fainelli <florian@openwrt.org>
To: stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
Ralf Baechle <ralf@linux-mips.org>,
David Daney <david.daney@cavium.com>,
"David S. Miller" <davem@davemloft.net>,
Wolfram Sang <w.sang@pengutronix.de>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Subject: [PATCH 09/25] MIPS: Octeon: use ehci-platform driver
Date: Wed, 3 Oct 2012 17:03:04 +0200 [thread overview]
Message-ID: <1349276601-8371-10-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349276601-8371-1-git-send-email-florian@openwrt.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
arch/mips/cavium-octeon/octeon-platform.c | 43 ++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
index 0938df1..539e1bc 100644
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -18,9 +18,11 @@
#include <linux/of_platform.h>
#include <linux/of_fdt.h>
#include <linux/libfdt.h>
+#include <linux/usb/ehci_pdriver.h>
#include <asm/octeon/octeon.h>
#include <asm/octeon/cvmx-rnm-defs.h>
+#include <asm/octeon/cvmx-uctlx-defs.h>
#include <asm/octeon/cvmx-helper.h>
#include <asm/octeon/cvmx-helper-board.h>
@@ -169,6 +171,41 @@ out:
device_initcall(octeon_rng_device_init);
#ifdef CONFIG_USB
+void octeon2_usb_clocks_start(void);
+void octeon2_usb_clocks_stop(void);
+
+static int octeon_ehci_power_on(struct platform_device *pdev)
+{
+ union cvmx_uctlx_ehci_ctl ehci_ctl;
+
+ octeon2_usb_clocks_start();
+
+ ehci_ctl.u64 = cvmx_read_csr(CVMX_UCTLX_EHCI_CTL(0));
+ /* Use 64-bit addressing. */
+ ehci_ctl.s.ehci_64b_addr_en = 1;
+ ehci_ctl.s.l2c_addr_msb = 0;
+ ehci_ctl.s.l2c_buff_emod = 1; /* Byte swapped. */
+ ehci_ctl.s.l2c_desc_emod = 1; /* Byte swapped. */
+ cvmx_write_csr(CVMX_UCTLX_EHCI_CTL(0), ehci_ctl.u64);
+
+ return 0;
+}
+
+static void octeon_ehci_power_off(struct platform_device *pdev)
+{
+ octeon2_usb_clocks_stop();
+}
+
+static struct usb_ehci_pdata octeon_ehci_pdata = {
+#ifdef __BIG_ENDIAN
+ .big_endian_mmio = 1,
+#endif
+ .port_power_on = 1,
+ .power_on = octeon_ehci_power_on,
+ .power_off = octeon_ehci_power_off,
+};
+
+static u64 octeon_ehci_dma_mask = DMA_BIT_MASK(64);
static int __init octeon_ehci_device_init(void)
{
@@ -190,7 +227,7 @@ static int __init octeon_ehci_device_init(void)
if (octeon_is_simulation() || usb_disabled())
return 0; /* No USB in the simulator. */
- pd = platform_device_alloc("octeon-ehci", 0);
+ pd = platform_device_alloc("ehci-platform", 0);
if (!pd) {
ret = -ENOMEM;
goto out;
@@ -207,6 +244,10 @@ static int __init octeon_ehci_device_init(void)
if (ret)
goto fail;
+ pd.dev.platform_data = &octeon_ehci_pdata;
+ pd.dev.coherent_dma_mask = DMA_BIT_MASK(32);
+ pd.dev.dma_mask = &octeon_ehci_dma_mask;
+
ret = platform_device_add(pd);
if (ret)
goto fail;
--
1.7.9.5
next prev parent reply other threads:[~2012-10-03 15:19 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349276601-8371-1-git-send-email-florian@openwrt.org>
2012-10-03 15:02 ` [PATCH 01/25] USB: ehci: remove IXP4xx EHCI driver Florian Fainelli
2012-10-03 15:02 ` [PATCH 02/25] MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x Florian Fainelli
2012-10-03 15:02 ` [PATCH 03/25] USB: ehci: remove Loongson 1B EHCI driver Florian Fainelli
2012-10-03 15:02 ` [PATCH 04/25] MIPS: Netlogic: use ehci-platform driver Florian Fainelli
2012-10-03 16:47 ` Alan Stern
2012-10-04 14:51 ` Florian Fainelli
2012-10-04 10:51 ` Jonas Gorski
2012-10-03 15:03 ` [PATCH 05/25] USB: ehci: remove Netlogic XLS EHCI driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 06/25] USB: ehci: allow need_io_watchdog to be passed to ehci-platform driver Florian Fainelli
2012-10-03 16:01 ` Alan Stern
2012-10-03 16:12 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 07/25] MIPS: Alchemy: use the ehci platform driver Florian Fainelli
2012-10-03 15:14 ` Manuel Lauss
2012-10-03 15:20 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 08/25] USB: ehci: remove Alchemy EHCI driver Florian Fainelli
2012-10-03 15:03 ` Florian Fainelli [this message]
2012-10-03 16:45 ` [PATCH 09/25] MIPS: Octeon: use ehci-platform driver David Daney
2012-10-03 18:30 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 10/25] USB: ehci: remove Octeon EHCI driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 11/25] ARM: cns3xxx: use ehci platform driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 12/25] USB: ehci: remove CNS3xxx EHCI " Florian Fainelli
2012-10-03 16:16 ` Alan Stern
2012-10-03 15:03 ` [PATCH 13/25] USB: ohci: allow platform driver to specify the number of ports Florian Fainelli
2012-10-03 15:03 ` [PATCH 14/25] MIPS: PNX8550: use OHCI platform driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 14/25] MIPS: PNX8550: useOHCI " Florian Fainelli
2012-10-03 15:03 ` [PATCH 15/25] USB: ohci: remove PNX8550 OHCI driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 16/25] ARM: cns3xxx: use OHCI platform driver Florian Fainelli
2012-10-03 15:03 ` [PATCH 17/25] USB: ohci: remove CNS3xxx " Florian Fainelli
2012-10-03 15:03 ` [PATCH 18/25] MIPS: Octeon: use " Florian Fainelli
2012-10-03 16:47 ` David Daney
2012-10-03 15:03 ` [PATCH 19/25] USB: ohci: remove Octeon " Florian Fainelli
2012-10-03 15:03 ` [PATCH 20/25] MIPS: Netlogic: convert to use " Florian Fainelli
2012-10-04 10:53 ` Jonas Gorski
2012-10-03 15:03 ` [PATCH 21/25] USB: ohci: remove Netlogic XLS " Florian Fainelli
2012-10-03 15:03 ` [PATCH 22/25] sh: convert boards to use the " Florian Fainelli
2012-10-03 15:03 ` [PATCH 23/25] USB: ohci: remove OHCI SH " Florian Fainelli
2012-10-03 15:03 ` [PATCH 24/25] MIPS: Alchemy: use the OHCI " Florian Fainelli
2012-10-03 15:21 ` Manuel Lauss
2012-10-03 15:24 ` Florian Fainelli
2012-10-03 15:26 ` Manuel Lauss
2012-10-03 16:07 ` Manuel Lauss
2012-10-03 16:13 ` Florian Fainelli
2012-10-03 15:03 ` [PATCH 25/25] USB: ohci: remove Alchemy " Florian Fainelli
2012-10-03 16:47 ` Alan Stern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349276601-8371-10-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=davem@davemloft.net \
--cc=david.daney@cavium.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-usb@vger.kernel.org \
--cc=ralf@linux-mips.org \
--cc=stern@rowland.harvard.edu \
--cc=w.sang@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®