MIPS: MSP71xx: Platform support for MSP on-chip USB controller.

Signed-off-by: Anoop P A <anoop.pa@gmail.com>
To: linux-mips@linux-mips.org
To: linux-kernel@vger.kernel.org
Cc: Anoop P A <anoop.pa@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/2043/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 182 insertions, 64 deletions

diff --git a/arch/mips/pmc-sierra/Kconfig b/arch/mips/pmc-sierra/Kconfig
index 8d798497c614..c437b8a8ab8c 100644
--- a/arch/mips/pmc-sierra/Kconfig
+++ b/arch/mips/pmc-sierra/Kconfig
@@ -23,6 +23,7 @@ config PMC_MSP7120_GW
         select SYS_SUPPORTS_MULTITHREADING
         select IRQ_MSP_CIC
         select HW_HAS_PCI
+        select MSP_HAS_USB
 
 config PMC_MSP7120_FPGA
         bool "PMC-Sierra MSP7120 FPGA"
@@ -35,3 +36,7 @@ endchoice
 config HYPERTRANSPORT
         bool "Hypertransport Support for PMC-Sierra Yosemite"
         depends on PMC_YOSEMITE
+
+config MSP_HAS_USB
+        boolean
+        depends on PMC_MSP
diff --git a/arch/mips/pmc-sierra/msp71xx/Makefile b/arch/mips/pmc-sierra/msp71xx/Makefile
index a002fa222b25..f26cab349c38 100644
--- a/arch/mips/pmc-sierra/msp71xx/Makefile
+++ b/arch/mips/pmc-sierra/msp71xx/Makefile
@@ -9,6 +9,6 @@ obj-$(CONFIG_IRQ_MSP_SLP) += msp_irq_slp.o
 obj-$(CONFIG_IRQ_MSP_CIC) += msp_irq_cic.o msp_irq_per.o
 obj-$(CONFIG_PCI) += msp_pci.o
 obj-$(CONFIG_MSPETH) += msp_eth.o
-obj-$(CONFIG_USB_MSP71XX) += msp_usb.o
+obj-$(CONFIG_MSP_HAS_USB) += msp_usb.o
 obj-$(CONFIG_MIPS_MT_SMP) += msp_smp.o
 obj-$(CONFIG_MIPS_MT_SMTC) += msp_smtc.o
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_usb.c b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
index 0ee01e359dd8..9a1aef89bd4c 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_usb.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
@@ -1,7 +1,7 @@
 /*
  * The setup file for USB related hardware on PMC-Sierra MSP processors.
  *
- * Copyright 2006-2007 PMC-Sierra, Inc.
+ * Copyright 2006 PMC-Sierra, Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -23,8 +23,8 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_GADGET)
 
-#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
@@ -34,40 +34,56 @@
 #include <msp_regs.h>
 #include <msp_int.h>
 #include <msp_prom.h>
+#include <msp_usb.h>
+
 
 #if defined(CONFIG_USB_EHCI_HCD)
-static struct resource msp_usbhost_resources [] = {
-        [0] = {
-                .start  = MSP_USB_BASE_START,
-                .end    = MSP_USB_BASE_END,
-                .flags  = IORESOURCE_MEM,
+static struct resource msp_usbhost0_resources[] = {
+        [0] = { /* EHCI-HS operational and capabilities registers */
+                .start  = MSP_USB0_HS_START,
+                .end    = MSP_USB0_HS_END,
+                .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = MSP_INT_USB,
-                .end    = MSP_INT_USB,
-                .flags  = IORESOURCE_IRQ,
+                .start  = MSP_INT_USB,
+                .end    = MSP_INT_USB,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = { /* MSBus-to-AMBA bridge register space */
+                .start  = MSP_USB0_MAB_START,
+                .end    = MSP_USB0_MAB_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [3] = { /* Identification and general hardware parameters */
+                .start  = MSP_USB0_ID_START,
+                .end    = MSP_USB0_ID_END,
+                .flags  = IORESOURCE_MEM,
         },
 };
 
-static u64 msp_usbhost_dma_mask = DMA_BIT_MASK(32);
+static u64 msp_usbhost0_dma_mask = 0xffffffffUL;
 
-static struct platform_device msp_usbhost_device = {
-        .name   = "pmcmsp-ehci",
-        .id     = 0,
+static struct mspusb_device msp_usbhost0_device = {
         .dev    = {
-                .dma_mask = &msp_usbhost_dma_mask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .name   = "pmcmsp-ehci",
+                .id     = 0,
+                .dev    = {
+                        .dma_mask = &msp_usbhost0_dma_mask,
+                        .coherent_dma_mask = 0xffffffffUL,
+                },
+                .num_resources  = ARRAY_SIZE(msp_usbhost0_resources),
+                .resource       = msp_usbhost0_resources,
         },
-        .num_resources  = ARRAY_SIZE(msp_usbhost_resources),
-        .resource       = msp_usbhost_resources,
 };
-#endif /* CONFIG_USB_EHCI_HCD */
 
-#if defined(CONFIG_USB_GADGET)
-static struct resource msp_usbdev_resources [] = {
-        [0] = {
-                .start  = MSP_USB_BASE,
-                .end    = MSP_USB_BASE_END,
+/* MSP7140/MSP82XX has two USB2 hosts. */
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+static u64 msp_usbhost1_dma_mask = 0xffffffffUL;
+
+static struct resource msp_usbhost1_resources[] = {
+        [0] = { /* EHCI-HS operational and capabilities registers */
+                .start  = MSP_USB1_HS_START,
+                .end    = MSP_USB1_HS_END,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -75,76 +91,173 @@ static struct resource msp_usbdev_resources [] = {
                 .end    = MSP_INT_USB,
                 .flags  = IORESOURCE_IRQ,
         },
+        [2] = { /* MSBus-to-AMBA bridge register space */
+                .start  = MSP_USB1_MAB_START,
+                .end    = MSP_USB1_MAB_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [3] = { /* Identification and general hardware parameters */
+                .start  = MSP_USB1_ID_START,
+                .end    = MSP_USB1_ID_END,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct mspusb_device msp_usbhost1_device = {
+        .dev    = {
+                .name   = "pmcmsp-ehci",
+                .id     = 1,
+                .dev    = {
+                        .dma_mask = &msp_usbhost1_dma_mask,
+                        .coherent_dma_mask = 0xffffffffUL,
+                },
+                .num_resources  = ARRAY_SIZE(msp_usbhost1_resources),
+                .resource       = msp_usbhost1_resources,
+        },
 };
+#endif /* CONFIG_MSP_HAS_DUAL_USB */
+#endif /* CONFIG_USB_EHCI_HCD */
 
-static u64 msp_usbdev_dma_mask = DMA_BIT_MASK(32);
+#if defined(CONFIG_USB_GADGET)
+static struct resource msp_usbdev0_resources[] = {
+        [0] = { /* EHCI-HS operational and capabilities registers */
+                .start  = MSP_USB0_HS_START,
+                .end    = MSP_USB0_HS_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = MSP_INT_USB,
+                .end    = MSP_INT_USB,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = { /* MSBus-to-AMBA bridge register space */
+                .start  = MSP_USB0_MAB_START,
+                .end    = MSP_USB0_MAB_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [3] = { /* Identification and general hardware parameters */
+                .start  = MSP_USB0_ID_START,
+                .end    = MSP_USB0_ID_END,
+                .flags  = IORESOURCE_MEM,
+        },
+};
 
-static struct platform_device msp_usbdev_device = {
-        .name   = "msp71xx_udc",
-        .id     = 0,
+static u64 msp_usbdev_dma_mask = 0xffffffffUL;
+
+/* This may need to be converted to a mspusb_device, too. */
+static struct mspusb_device msp_usbdev0_device = {
         .dev    = {
-                .dma_mask = &msp_usbdev_dma_mask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .name   = "msp71xx_udc",
+                .id     = 0,
+                .dev    = {
+                        .dma_mask = &msp_usbdev_dma_mask,
+                        .coherent_dma_mask = 0xffffffffUL,
+                },
+                .num_resources  = ARRAY_SIZE(msp_usbdev0_resources),
+                .resource       = msp_usbdev0_resources,
         },
-        .num_resources  = ARRAY_SIZE(msp_usbdev_resources),
-        .resource       = msp_usbdev_resources,
 };
-#endif /* CONFIG_USB_GADGET */
 
-#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_GADGET)
-static struct platform_device *msp_devs[1];
-#endif
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+static struct resource msp_usbdev1_resources[] = {
+        [0] = { /* EHCI-HS operational and capabilities registers */
+                .start  = MSP_USB1_HS_START,
+                .end    = MSP_USB1_HS_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = MSP_INT_USB,
+                .end    = MSP_INT_USB,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = { /* MSBus-to-AMBA bridge register space */
+                .start  = MSP_USB1_MAB_START,
+                .end    = MSP_USB1_MAB_END,
+                .flags  = IORESOURCE_MEM,
+        },
+        [3] = { /* Identification and general hardware parameters */
+                .start  = MSP_USB1_ID_START,
+                .end    = MSP_USB1_ID_END,
+                .flags  = IORESOURCE_MEM,
+        },
+};
 
+/* This may need to be converted to a mspusb_device, too. */
+static struct mspusb_device msp_usbdev1_device = {
+        .dev    = {
+                .name   = "msp71xx_udc",
+                .id     = 0,
+                .dev    = {
+                        .dma_mask = &msp_usbdev_dma_mask,
+                        .coherent_dma_mask = 0xffffffffUL,
+                },
+                .num_resources  = ARRAY_SIZE(msp_usbdev1_resources),
+                .resource       = msp_usbdev1_resources,
+        },
+};
+
+#endif /* CONFIG_MSP_HAS_DUAL_USB */
+#endif /* CONFIG_USB_GADGET */
 
 static int __init msp_usb_setup(void)
 {
-#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_GADGET)
-        char *strp;
-        char envstr[32];
-        unsigned int val = 0;
-        int result = 0;
+        char            *strp;
+        char            envstr[32];
+        struct platform_device *msp_devs[NUM_USB_DEVS];
+        unsigned int val;
 
+        /* construct environment name usbmode */
+        /* set usbmode <host/device> as pmon environment var */
         /*
-         * construct environment name usbmode
-         * set usbmode <host/device> as pmon environment var
+         * Could this perhaps be integrated into the "features" env var?
+         * Use the features key "U", and follow with "H" for host-mode,
+         * "D" for device-mode.  If it works for Ethernet, why not USB...
+         *  -- hammtrev, 2007/03/22
          */
         snprintf((char *)&envstr[0], sizeof(envstr), "usbmode");
 
-#if defined(CONFIG_USB_EHCI_HCD)
-        /* default to host mode */
+        /* set default host mode */
         val = 1;
-#endif
 
         /* get environment string */
         strp = prom_getenv((char *)&envstr[0]);
         if (strp) {
+                /* compare string */
                 if (!strcmp(strp, "device"))
                         val = 0;
         }
 
         if (val) {
 #if defined(CONFIG_USB_EHCI_HCD)
-                /* get host mode device */
-                msp_devs[0] = &msp_usbhost_device;
-                ppfinit("platform add USB HOST done %s.\n",
-                            msp_devs[0]->name);
-
-                result = platform_add_devices(msp_devs, ARRAY_SIZE(msp_devs));
-#endif /* CONFIG_USB_EHCI_HCD */
-        }
+                msp_devs[0] = &msp_usbhost0_device.dev;
+                ppfinit("platform add USB HOST done %s.\n", msp_devs[0]->name);
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+                msp_devs[1] = &msp_usbhost1_device.dev;
+                ppfinit("platform add USB HOST done %s.\n", msp_devs[1]->name);
+#endif
+#else
+                ppfinit("%s: echi_hcd not supported\n", __FILE__);
+#endif  /* CONFIG_USB_EHCI_HCD */
+        } else {
 #if defined(CONFIG_USB_GADGET)
-        else {
                 /* get device mode structure */
-                msp_devs[0] = &msp_usbdev_device;
-                ppfinit("platform add USB DEVICE done %s.\n",
-                            msp_devs[0]->name);
-
-                result = platform_add_devices(msp_devs, ARRAY_SIZE(msp_devs));
+                msp_devs[0] = &msp_usbdev0_device.dev;
+                ppfinit("platform add USB DEVICE done %s.\n"
+                                        , msp_devs[0]->name);
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+                msp_devs[1] = &msp_usbdev1_device.dev;
+                ppfinit("platform add USB DEVICE done %s.\n"
+                                        , msp_devs[1]->name);
+#endif
+#else
+                ppfinit("%s: usb_gadget not supported\n", __FILE__);
+#endif  /* CONFIG_USB_GADGET */
         }
-#endif /* CONFIG_USB_GADGET */
-#endif /* CONFIG_USB_EHCI_HCD || CONFIG_USB_GADGET */
+        /* add device */
+        platform_add_devices(msp_devs, ARRAY_SIZE(msp_devs));
 
-        return result;
+        return 0;
 }
 
 subsys_initcall(msp_usb_setup);
+#endif /* CONFIG_USB_EHCI_HCD || CONFIG_USB_GADGET */