1 From da796ae30e2a3cf107d2fc46996a86e918b219be Mon Sep 17 00:00:00 2001
2 From: Maxime Bizon <mbizon@freebox.fr>
3 Date: Tue, 24 May 2011 21:50:33 +0200
4 Subject: [PATCH 33/72] MIPS: BCM63XX: register ehci device.
7 arch/mips/bcm63xx/Kconfig | 2 +
8 arch/mips/bcm63xx/Makefile | 2 +-
9 arch/mips/bcm63xx/boards/board_bcm963xx.c | 4 ++
10 arch/mips/bcm63xx/dev-usb-ehci.c | 50 ++++++++++++++++++++
11 .../asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h | 6 +++
12 5 files changed, 63 insertions(+), 1 deletion(-)
13 create mode 100644 arch/mips/bcm63xx/dev-usb-ehci.c
14 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
16 --- a/arch/mips/bcm63xx/Kconfig
17 +++ b/arch/mips/bcm63xx/Kconfig
18 @@ -22,6 +22,7 @@ config BCM63XX_CPU_6358
19 bool "support 6358 CPU"
21 select USB_ARCH_HAS_OHCI if USB_SUPPORT
22 + select USB_ARCH_HAS_EHCI if USB_SUPPORT
24 config BCM63XX_CPU_6362
25 bool "support 6362 CPU"
26 @@ -31,6 +32,7 @@ config BCM63XX_CPU_6368
27 bool "support 6368 CPU"
29 select USB_ARCH_HAS_OHCI if USB_SUPPORT
30 + select USB_ARCH_HAS_EHCI if USB_SUPPORT
33 source "arch/mips/bcm63xx/boards/Kconfig"
34 --- a/arch/mips/bcm63xx/Makefile
35 +++ b/arch/mips/bcm63xx/Makefile
37 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
38 setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
39 dev-pcmcia.o dev-rng.o dev-spi.o dev-uart.o dev-wdt.o \
40 - dev-usb-ohci.o dev-usb-usbd.o
41 + dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o
42 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
45 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
46 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
48 #include <bcm63xx_dev_pcmcia.h>
49 #include <bcm63xx_dev_spi.h>
50 #include <bcm63xx_dev_usb_ohci.h>
51 +#include <bcm63xx_dev_usb_ehci.h>
52 #include <bcm63xx_dev_usb_usbd.h>
53 #include <board_bcm963xx.h>
55 @@ -924,6 +925,9 @@ int __init board_register_devices(void)
57 bcm63xx_usbd_register(&board.usbd);
59 + if (board.has_ehci0)
60 + bcm63xx_ehci_register();
63 bcm63xx_ohci_register();
66 +++ b/arch/mips/bcm63xx/dev-usb-ehci.c
69 + * This file is subject to the terms and conditions of the GNU General Public
70 + * License. See the file "COPYING" in the main directory of this archive
73 + * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
76 +#include <linux/init.h>
77 +#include <linux/kernel.h>
78 +#include <linux/platform_device.h>
79 +#include <bcm63xx_cpu.h>
80 +#include <bcm63xx_dev_usb_ehci.h>
82 +static struct resource ehci_resources[] = {
84 + .start = -1, /* filled at runtime */
85 + .end = -1, /* filled at runtime */
86 + .flags = IORESOURCE_MEM,
89 + .start = -1, /* filled at runtime */
90 + .flags = IORESOURCE_IRQ,
94 +static u64 ehci_dmamask = ~(u32)0;
96 +static struct platform_device bcm63xx_ehci_device = {
97 + .name = "bcm63xx_ehci",
99 + .num_resources = ARRAY_SIZE(ehci_resources),
100 + .resource = ehci_resources,
102 + .dma_mask = &ehci_dmamask,
103 + .coherent_dma_mask = 0xffffffff,
107 +int __init bcm63xx_ehci_register(void)
109 + if (!BCMCPU_IS_6358() && !BCMCPU_IS_6368())
112 + ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0);
113 + ehci_resources[0].end = ehci_resources[0].start;
114 + ehci_resources[0].end += RSET_EHCI_SIZE - 1;
115 + ehci_resources[1].start = bcm63xx_get_irq_number(IRQ_EHCI0);
116 + return platform_device_register(&bcm63xx_ehci_device);
119 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
121 +#ifndef BCM63XX_DEV_USB_EHCI_H_
122 +#define BCM63XX_DEV_USB_EHCI_H_
124 +int bcm63xx_ehci_register(void);
126 +#endif /* BCM63XX_DEV_USB_EHCI_H_ */