MIPS: BCM63XX: Create platform_device for USBD

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Reviewed-by: Jonas Gorski <jonas.gorski@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/4111/
Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile
index 833af72c852abdbc806362f364026a99a453a4f6..9bbb30a9dc2061e586eefe8b7a38a7192010d468 100644 (file)
--- a/arch/mips/bcm63xx/Makefile
+++ b/arch/mips/bcm63xx/Makefile
@@ -1,6 +1,6 @@
 obj-y          += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
                   dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-rng.o \
-                  dev-spi.o dev-uart.o dev-wdt.o
+                  dev-spi.o dev-uart.o dev-wdt.o dev-usb-usbd.o
 obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o
 
 obj-y          += boards/

diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index feb05258a4d1519368a0e7f2395415a4a87e84b1..ea4ea77c6297dff8e97a833344f06c2854faf83e 100644 (file)
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -24,6 +24,7 @@
 #include <bcm63xx_dev_flash.h>
 #include <bcm63xx_dev_pcmcia.h>
 #include <bcm63xx_dev_spi.h>
+#include <bcm63xx_dev_usb_usbd.h>
 #include <board_bcm963xx.h>
 
 #define PFX    "board_bcm963xx: "
@@ -42,6 +43,12 @@ static struct board_info __initdata board_96328avng = {
 
        .has_uart0                      = 1,
        .has_pci                        = 1,
+       .has_usbd                       = 0,
+
+       .usbd = {
+               .use_fullspeed          = 0,
+               .port_no                = 0,
+       },
 
        .leds = {
                {
@@ -888,6 +895,9 @@ int __init board_register_devices(void)
            !board_get_mac_address(board.enet1.mac_addr))
                bcm63xx_enet_register(1, &board.enet1);
 
+       if (board.has_usbd)
+               bcm63xx_usbd_register(&board.usbd);
+
        if (board.has_dsp)
                bcm63xx_dsp_register(&board.dsp);
 

diff --git a/arch/mips/bcm63xx/dev-usb-usbd.c b/arch/mips/bcm63xx/dev-usb-usbd.c
new file mode 100644 (file)
index 0000000..508bd9d
--- /dev/null
+++ b/arch/mips/bcm63xx/dev-usb-usbd.c
@@ -0,0 +1,65 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
+ * Copyright (C) 2012 Kevin Cernekee <cernekee@gmail.com>
+ * Copyright (C) 2012 Broadcom Corporation
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <bcm63xx_cpu.h>
+#include <bcm63xx_dev_usb_usbd.h>
+
+#define NUM_MMIO               2
+#define NUM_IRQ                        7
+
+static struct resource usbd_resources[NUM_MMIO + NUM_IRQ];
+
+static u64 usbd_dmamask = DMA_BIT_MASK(32);
+
+static struct platform_device bcm63xx_usbd_device = {
+       .name           = "bcm63xx_udc",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(usbd_resources),
+       .resource       = usbd_resources,
+       .dev            = {
+               .dma_mask               = &usbd_dmamask,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+       },
+};
+
+int __init bcm63xx_usbd_register(const struct bcm63xx_usbd_platform_data *pd)
+{
+       const int irq_list[NUM_IRQ] = { IRQ_USBD,
+               IRQ_USBD_RXDMA0, IRQ_USBD_TXDMA0,
+               IRQ_USBD_RXDMA1, IRQ_USBD_TXDMA1,
+               IRQ_USBD_RXDMA2, IRQ_USBD_TXDMA2 };
+       int i;
+
+       if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
+               return 0;
+
+       usbd_resources[0].start = bcm63xx_regset_address(RSET_USBD);
+       usbd_resources[0].end = usbd_resources[0].start + RSET_USBD_SIZE - 1;
+       usbd_resources[0].flags = IORESOURCE_MEM;
+
+       usbd_resources[1].start = bcm63xx_regset_address(RSET_USBDMA);
+       usbd_resources[1].end = usbd_resources[1].start + RSET_USBDMA_SIZE - 1;
+       usbd_resources[1].flags = IORESOURCE_MEM;
+
+       for (i = 0; i < NUM_IRQ; i++) {
+               struct resource *r = &usbd_resources[NUM_MMIO + i];
+
+               r->start = r->end = bcm63xx_get_irq_number(irq_list[i]);
+               r->flags = IORESOURCE_IRQ;
+       }
+
+       platform_device_add_data(&bcm63xx_usbd_device, pd, sizeof(*pd));
+
+       return platform_device_register(&bcm63xx_usbd_device);
+}

diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
new file mode 100644 (file)
index 0000000..5d6d698
--- /dev/null
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
@@ -0,0 +1,17 @@
+#ifndef BCM63XX_DEV_USB_USBD_H_
+#define BCM63XX_DEV_USB_USBD_H_
+
+/*
+ * usb device platform data
+ */
+struct bcm63xx_usbd_platform_data {
+       /* board can only support full speed (USB 1.1) */
+       int use_fullspeed;
+
+       /* 0-based port index, for chips with >1 USB PHY */
+       int port_no;
+};
+
+int bcm63xx_usbd_register(const struct bcm63xx_usbd_platform_data *pd);
+
+#endif /* BCM63XX_DEV_USB_USBD_H_ */

diff --git a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
index 474daaa534975b921b2f5321ddae57117832a226..b0dd4bb53f7e5b676fab00716c39e80e385e30dc 100644 (file)
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -5,6 +5,7 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <bcm63xx_dev_enet.h>
+#include <bcm63xx_dev_usb_usbd.h>
 #include <bcm63xx_dev_dsp.h>
 
 /*
@@ -44,6 +45,7 @@ struct board_info {
        unsigned int    has_pccard:1;
        unsigned int    has_ohci0:1;
        unsigned int    has_ehci0:1;
+       unsigned int    has_usbd:1;
        unsigned int    has_dsp:1;
        unsigned int    has_uart0:1;
        unsigned int    has_uart1:1;
@@ -52,6 +54,9 @@ struct board_info {
        struct bcm63xx_enet_platform_data enet0;
        struct bcm63xx_enet_platform_data enet1;
 
+       /* USB config */
+       struct bcm63xx_usbd_platform_data usbd;
+
        /* DSP config */
        struct bcm63xx_dsp_platform_data dsp;