bcm63xx: Add support for Linux 3.0-rc3
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.0 / 180-udc_preliminary_support.patch
1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
3 @@ -29,6 +29,7 @@
4 #include <bcm63xx_dev_pcmcia.h>
5 #include <bcm63xx_dev_usb_ohci.h>
6 #include <bcm63xx_dev_usb_ehci.h>
7 +#include <bcm63xx_dev_usb_udc.h>
8 #include <board_bcm963xx.h>
9
10 #define PFX "board_bcm963xx: "
11 @@ -400,6 +401,8 @@ static struct board_info __initdata boar
12 .has_ohci0 = 1,
13 .has_pccard = 1,
14 .has_ehci0 = 1,
15 +
16 + .has_udc0 = 1,
17 };
18
19 static struct board_info __initdata board_rta1025w_16 = {
20 @@ -921,6 +924,9 @@ int __init board_register_devices(void)
21 if (board.has_dsp)
22 bcm63xx_dsp_register(&board.dsp);
23
24 + if (board.has_udc0)
25 + bcm63xx_udc_register();
26 +
27 /* read base address of boot chip select (0) */
28 if (BCMCPU_IS_6345())
29 val = 0x1fc00000;
30 --- /dev/null
31 +++ b/arch/mips/bcm63xx/dev-usb-udc.c
32 @@ -0,0 +1,58 @@
33 +/*
34 + * Copyright (C) 2009 Henk Vergonet <Henk.Vergonet@gmail.com>
35 + *
36 + * This program is free software; you can redistribute it and/or
37 + * modify it under the terms of the GNU General Public License as
38 + * published by the Free Software Foundation; either version 2 of
39 + * the License, or (at your option) any later version.
40 + *
41 + * This program is distributed in the hope that it will be useful,
42 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
43 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
44 + * GNU General Public License for more details.
45 + *
46 + * You should have received a copy of the GNU General Public License
47 + * along with this program; if not, write to the Free Software
48 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
49 + */
50 +#include <linux/init.h>
51 +#include <linux/kernel.h>
52 +#include <linux/platform_device.h>
53 +#include <bcm63xx_cpu.h>
54 +
55 +static struct resource udc_resources[] = {
56 + {
57 + .start = -1, /* filled at runtime */
58 + .end = -1, /* filled at runtime */
59 + .flags = IORESOURCE_MEM,
60 + },
61 + {
62 + .start = -1, /* filled at runtime */
63 + .flags = IORESOURCE_IRQ,
64 + },
65 +};
66 +
67 +static u64 udc_dmamask = ~(u32)0;
68 +
69 +static struct platform_device bcm63xx_udc_device = {
70 + .name = "bcm63xx-udc",
71 + .id = 0,
72 + .num_resources = ARRAY_SIZE(udc_resources),
73 + .resource = udc_resources,
74 + .dev = {
75 + .dma_mask = &udc_dmamask,
76 + .coherent_dma_mask = 0xffffffff,
77 + },
78 +};
79 +
80 +int __init bcm63xx_udc_register(void)
81 +{
82 + if (!BCMCPU_IS_6338() && !BCMCPU_IS_6345() && !BCMCPU_IS_6348())
83 + return 0;
84 +
85 + udc_resources[0].start = bcm63xx_regset_address(RSET_UDC0);
86 + udc_resources[0].end = udc_resources[0].start;
87 + udc_resources[0].end += RSET_UDC_SIZE - 1;
88 + udc_resources[1].start = bcm63xx_get_irq_number(IRQ_UDC0);
89 + return platform_device_register(&bcm63xx_udc_device);
90 +}
91 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
92 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
93 @@ -127,7 +127,7 @@ enum bcm63xx_regs_set {
94 #define BCM_6338_UART1_BASE (0xdeadbeef)
95 #define BCM_6338_GPIO_BASE (0xfffe0400)
96 #define BCM_6338_SPI_BASE (0xfffe0c00)
97 -#define BCM_6338_UDC0_BASE (0xdeadbeef)
98 +#define BCM_6338_UDC0_BASE (0xfffe3000)
99 #define BCM_6338_USBDMA_BASE (0xfffe2400)
100 #define BCM_6338_OHCI0_BASE (0xdeadbeef)
101 #define BCM_6338_OHCI_PRIV_BASE (0xfffe3000)
102 @@ -158,7 +158,7 @@ enum bcm63xx_regs_set {
103 #define BCM_6345_UART1_BASE (0xdeadbeef)
104 #define BCM_6345_GPIO_BASE (0xfffe0400)
105 #define BCM_6345_SPI_BASE (0xdeadbeef)
106 -#define BCM_6345_UDC0_BASE (0xdeadbeef)
107 +#define BCM_6345_UDC0_BASE (0xfffe2100)
108 #define BCM_6345_USBDMA_BASE (0xfffe2800)
109 #define BCM_6345_ENET0_BASE (0xfffe1800)
110 #define BCM_6345_ENETDMA_BASE (0xfffe2800)
111 @@ -215,7 +215,7 @@ enum bcm63xx_regs_set {
112 #define BCM_6358_UART1_BASE (0xfffe0120)
113 #define BCM_6358_GPIO_BASE (0xfffe0080)
114 #define BCM_6358_SPI_BASE (0xdeadbeef)
115 -#define BCM_6358_UDC0_BASE (0xfffe0800)
116 +#define BCM_6358_UDC0_BASE (0xfffe0400)
117 #define BCM_6358_OHCI0_BASE (0xfffe1400)
118 #define BCM_6358_OHCI_PRIV_BASE (0xdeadbeef)
119 #define BCM_6358_USBH_PRIV_BASE (0xfffe1500)
120 @@ -444,6 +444,7 @@ enum bcm63xx_irq {
121 IRQ_UART0,
122 IRQ_UART1,
123 IRQ_DSL,
124 + IRQ_UDC0,
125 IRQ_ENET0,
126 IRQ_ENET1,
127 IRQ_ENET_PHY,
128 @@ -486,7 +487,7 @@ enum bcm63xx_irq {
129 #define BCM_6345_UART0_IRQ (IRQ_INTERNAL_BASE + 2)
130 #define BCM_6345_DSL_IRQ (IRQ_INTERNAL_BASE + 3)
131 #define BCM_6345_ATM_IRQ (IRQ_INTERNAL_BASE + 4)
132 -#define BCM_6345_USB_IRQ (IRQ_INTERNAL_BASE + 5)
133 +#define BCM_6345_UDC0_IRQ (IRQ_INTERNAL_BASE + 5)
134 #define BCM_6345_ENET0_IRQ (IRQ_INTERNAL_BASE + 8)
135 #define BCM_6345_ENET_PHY_IRQ (IRQ_INTERNAL_BASE + 12)
136 #define BCM_6345_ENET0_RXDMA_IRQ (IRQ_INTERNAL_BASE + 13 + 1)
137 @@ -508,10 +509,17 @@ enum bcm63xx_irq {
138 #define BCM_6348_TIMER_IRQ (IRQ_INTERNAL_BASE + 0)
139 #define BCM_6348_UART0_IRQ (IRQ_INTERNAL_BASE + 2)
140 #define BCM_6348_DSL_IRQ (IRQ_INTERNAL_BASE + 4)
141 +#define BCM_6348_UDC0_IRQ (IRQ_INTERNAL_BASE + 6)
142 #define BCM_6348_ENET1_IRQ (IRQ_INTERNAL_BASE + 7)
143 #define BCM_6348_ENET0_IRQ (IRQ_INTERNAL_BASE + 8)
144 #define BCM_6348_ENET_PHY_IRQ (IRQ_INTERNAL_BASE + 9)
145 #define BCM_6348_OHCI0_IRQ (IRQ_INTERNAL_BASE + 12)
146 +#define BCM_6348_USB_CNTL_RX_DMA_IRQ (IRQ_INTERNAL_BASE + 14)
147 +#define BCM_6348_USB_CNTL_TX_DMA_IRQ (IRQ_INTERNAL_BASE + 15)
148 +#define BCM_6348_USB_BULK_RX_DMA_IRQ (IRQ_INTERNAL_BASE + 16)
149 +#define BCM_6348_USB_BULK_TX_DMA_IRQ (IRQ_INTERNAL_BASE + 17)
150 +#define BCM_6348_USB_ISO_RX_DMA_IRQ (IRQ_INTERNAL_BASE + 18)
151 +#define BCM_6348_USB_ISO_TX_DMA_IRQ (IRQ_INTERNAL_BASE + 19)
152 #define BCM_6348_ENET0_RXDMA_IRQ (IRQ_INTERNAL_BASE + 20)
153 #define BCM_6348_ENET0_TXDMA_IRQ (IRQ_INTERNAL_BASE + 21)
154 #define BCM_6348_ENET1_RXDMA_IRQ (IRQ_INTERNAL_BASE + 22)
155 --- /dev/null
156 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h
157 @@ -0,0 +1,6 @@
158 +#ifndef BCM63XX_DEV_USB_UDC_H_
159 +#define BCM63XX_DEV_USB_UDC_H_
160 +
161 +int bcm63xx_udc_register(void);
162 +
163 +#endif /* BCM63XX_DEV_USB_UDC_H_ */
164 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
165 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
166 @@ -47,6 +47,7 @@ struct board_info {
167 unsigned int has_dsp:1;
168 unsigned int has_uart0:1;
169 unsigned int has_uart1:1;
170 + unsigned int has_udc0:1;
171
172 /* ethernet config */
173 struct bcm63xx_enet_platform_data enet0;
174 --- a/arch/mips/bcm63xx/Makefile
175 +++ b/arch/mips/bcm63xx/Makefile
176 @@ -1,6 +1,6 @@
177 obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
178 dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o \
179 - dev-usb-ohci.o dev-usb-ehci.o
180 + dev-usb-ohci.o dev-usb-ehci.o dev-usb-udc.o
181 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
182
183 obj-y += boards/
184 --- a/arch/mips/bcm63xx/clk.c
185 +++ b/arch/mips/bcm63xx/clk.c
186 @@ -141,6 +141,30 @@ static struct clk clk_usbh = {
187 };
188
189 /*
190 + * USB slave clock
191 + */
192 +static void usbs_set(struct clk *clk, int enable)
193 +{
194 + u32 mask;
195 +
196 + switch(bcm63xx_get_cpu_id()) {
197 + case BCM6338_CPU_ID:
198 + mask = CKCTL_6338_USBS_EN;
199 + break;
200 + case BCM6348_CPU_ID:
201 + mask = CKCTL_6348_USBS_EN;
202 + break;
203 + default:
204 + return;
205 + }
206 + bcm_hwclock_set(mask, enable);
207 +}
208 +
209 +static struct clk clk_usbs = {
210 + .set = usbs_set,
211 +};
212 +
213 +/*
214 * SPI clock
215 */
216 static void spi_set(struct clk *clk, int enable)
217 @@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev,
218 return &clk_ephy;
219 if (!strcmp(id, "usbh"))
220 return &clk_usbh;
221 + if (!strcmp(id, "usbs"))
222 + return &clk_usbs;
223 if (!strcmp(id, "spi"))
224 return &clk_spi;
225 if (!strcmp(id, "periph"))
226 --- a/arch/mips/bcm63xx/Kconfig
227 +++ b/arch/mips/bcm63xx/Kconfig
228 @@ -7,6 +7,7 @@ config BCM63XX_CPU_6338
229 select USB_ARCH_HAS_OHCI
230 select USB_OHCI_BIG_ENDIAN_DESC
231 select USB_OHCI_BIG_ENDIAN_MMIO
232 + select USB_ARCH_HAS_UDC
233
234 config BCM63XX_CPU_6345
235 bool "support 6345 CPU"
236 @@ -19,6 +20,7 @@ config BCM63XX_CPU_6348
237 select USB_ARCH_HAS_OHCI
238 select USB_OHCI_BIG_ENDIAN_DESC
239 select USB_OHCI_BIG_ENDIAN_MMIO
240 + select USB_ARCH_HAS_UDC
241
242 config BCM63XX_CPU_6358
243 bool "support 6358 CPU"