projects / openwrt / staging / wigyori.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
brcm63xx: rename target to bcm63xx
[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-4.19 / 341-MIPS-BCM63XX-add-support-for-BCM6318.patch
1 From 60c29522a8c77d96145d965589c56befda7d4c3d Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Sun, 8 Dec 2013 01:24:09 +0100
4 Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
5
6 ---
7 arch/mips/bcm63xx/Kconfig | 5 +
8 arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 +-
9 arch/mips/bcm63xx/clk.c | 8 +-
10 arch/mips/bcm63xx/cpu.c | 53 +++++++++++
11 arch/mips/bcm63xx/dev-flash.c | 3 +
12 arch/mips/bcm63xx/dev-spi.c | 2 +-
13 arch/mips/bcm63xx/irq.c | 10 ++
14 arch/mips/bcm63xx/prom.c | 2 +-
15 arch/mips/bcm63xx/reset.c | 24 +++++
16 arch/mips/bcm63xx/setup.c | 5 +-
17 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 107 ++++++++++++++++++++++
18 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 75 ++++++++++++++-
19 arch/mips/include/asm/mach-bcm63xx/ioremap.h | 1 +
20 13 files changed, 291 insertions(+), 6 deletions(-)
21
22 --- a/arch/mips/bcm63xx/Kconfig
23 +++ b/arch/mips/bcm63xx/Kconfig
24 @@ -19,6 +19,11 @@ config BCM63XX_EHCI
25 select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD
26 select USB_EHCI_BIG_ENDIAN_MMIO if USB_EHCI_HCD
27
28 +config BCM63XX_CPU_6318
29 + bool "support 6318 CPU"
30 + select SYS_HAS_CPU_BMIPS32_3300
31 + select HW_HAS_PCI
32 +
33 config BCM63XX_CPU_6328
34 bool "support 6328 CPU"
35 select SYS_HAS_CPU_BMIPS4350
36 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
37 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
38 @@ -697,7 +697,7 @@ void __init board_prom_init(void)
39 /* read base address of boot chip select (0)
40 * 6328/6362 do not have MPI but boot from a fixed address
41 */
42 - if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_63268()) {
43 + if (BCMCPU_IS_6318() || BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_63268()) {
44 val = 0x18000000;
45 } else {
46 val = bcm_mpi_readl(MPI_CSBASE_REG(0));
47 --- a/arch/mips/bcm63xx/clk.c
48 +++ b/arch/mips/bcm63xx/clk.c
49 @@ -289,7 +289,9 @@ static void hsspi_set(struct clk *clk, i
50 {
51 u32 mask;
52
53 - if (BCMCPU_IS_6328())
54 + if (BCMCPU_IS_6318())
55 + mask = CKCTL_6318_HSSPI_EN;
56 + else if (BCMCPU_IS_6328())
57 mask = CKCTL_6328_HSSPI_EN;
58 else if (BCMCPU_IS_6362())
59 mask = CKCTL_6362_HSSPI_EN;
60 @@ -444,6 +446,19 @@ static struct clk_lookup bcm3368_clks[]
61 CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
62 };
63
64 +static struct clk_lookup bcm6318_clks[] = {
65 + /* fixed rate clocks */
66 + CLKDEV_INIT(NULL, "periph", &clk_periph),
67 + CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
68 + CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
69 + /* gated clocks */
70 + CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
71 + CLKDEV_INIT(NULL, "usbh", &clk_usbh),
72 + CLKDEV_INIT(NULL, "usbd", &clk_usbh),
73 + CLKDEV_INIT(NULL, "hsspi", &clk_hsspi),
74 + CLKDEV_INIT(NULL, "pcie", &clk_pcie),
75 +};
76 +
77 static struct clk_lookup bcm6328_clks[] = {
78 /* fixed rate clocks */
79 CLKDEV_INIT(NULL, "periph", &clk_periph),
80 @@ -565,6 +580,7 @@ static struct clk_lookup bcm63268_clks[]
81 CLKDEV_INIT(NULL, "pcie", &clk_pcie),
82 };
83
84 +#define HSSPI_PLL_HZ_6318 250000000
85 #define HSSPI_PLL_HZ_6328 133333333
86 #define HSSPI_PLL_HZ_6362 400000000
87
88 @@ -574,6 +590,10 @@ static int __init bcm63xx_clk_init(void)
89 case BCM3368_CPU_ID:
90 clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
91 break;
92 + case BCM6318_CPU_ID:
93 + clk_hsspi_pll.rate = HSSPI_PLL_HZ_6318;
94 + clkdev_add_table(bcm6318_clks, ARRAY_SIZE(bcm6318_clks));
95 + break;
96 case BCM6328_CPU_ID:
97 clk_hsspi_pll.rate = HSSPI_PLL_HZ_6328;
98 clkdev_add_table(bcm6328_clks, ARRAY_SIZE(bcm6328_clks));
99 --- a/arch/mips/bcm63xx/cpu.c
100 +++ b/arch/mips/bcm63xx/cpu.c
101 @@ -41,6 +41,14 @@ static const int bcm3368_irqs[] = {
102 __GEN_CPU_IRQ_TABLE(3368)
103 };
104
105 +static const unsigned long bcm6318_regs_base[] = {
106 + __GEN_CPU_REGS_TABLE(6318)
107 +};
108 +
109 +static const int bcm6318_irqs[] = {
110 + __GEN_CPU_IRQ_TABLE(6318)
111 +};
112 +
113 static const unsigned long bcm6328_regs_base[] = {
114 __GEN_CPU_REGS_TABLE(6328)
115 };
116 @@ -134,6 +142,10 @@ unsigned int bcm63xx_get_memory_size(voi
117 return bcm63xx_memory_size;
118 }
119
120 +#define STRAP_OVERRIDE_BUS_REG 0x0
121 +#define OVERRIDE_BUS_MIPS_FREQ_SHIFT 23
122 +#define OVERRIDE_BUS_MIPS_FREQ_MASK (0x3 << OVERRIDE_BUS_MIPS_FREQ_SHIFT)
123 +
124 static unsigned int detect_cpu_clock(void)
125 {
126 u32 cpu_id = bcm63xx_get_cpu_id();
127 @@ -142,6 +154,28 @@ static unsigned int detect_cpu_clock(voi
128 case BCM3368_CPU_ID:
129 return 300000000;
130
131 + case BCM6318_CPU_ID:
132 + {
133 + unsigned int tmp, mips_pll_fcvo;
134 +
135 + tmp = bcm_readl(BCM_6318_STRAP_BASE + STRAP_OVERRIDE_BUS_REG);
136 +
137 + pr_info("strap_override_bus = %08x\n", tmp);
138 +
139 + mips_pll_fcvo = (tmp & OVERRIDE_BUS_MIPS_FREQ_MASK)
140 + >> OVERRIDE_BUS_MIPS_FREQ_SHIFT;
141 +
142 + switch (mips_pll_fcvo) {
143 + case 0:
144 + return 166000000;
145 + case 1:
146 + return 400000000;
147 + case 2:
148 + return 250000000;
149 + case 3:
150 + return 333000000;
151 + };
152 + }
153 case BCM6328_CPU_ID:
154 {
155 unsigned int tmp, mips_pll_fcvo;
156 @@ -297,6 +331,13 @@ static unsigned int detect_memory_size(v
157 unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0;
158 u32 val;
159
160 + if (BCMCPU_IS_6318()) {
161 + val = bcm_sdram_readl(SDRAM_CFG_REG);
162 + val = val & SDRAM_CFG_6318_SPACE_MASK;
163 + val >>= SDRAM_CFG_6318_SPACE_SHIFT;
164 + return 1 << (val + 20);
165 + }
166 +
167 if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_63268())
168 return bcm_ddr_readl(DDR_CSEND_REG) << 24;
169
170 @@ -343,6 +384,12 @@ void __init bcm63xx_cpu_init(void)
171
172 switch (current_cpu_type()) {
173 case CPU_BMIPS3300:
174 + if ((read_c0_prid() & 0xff) >= 0x33) {
175 + /* BCM6318 */
176 + chipid_reg = BCM_6368_PERF_BASE;
177 + break;
178 + }
179 +
180 if ((read_c0_prid() & PRID_IMP_MASK) != PRID_IMP_BMIPS3300_ALT)
181 __cpu_name[cpu] = "Broadcom BCM6338";
182 /* fall-through */
183 @@ -390,6 +437,10 @@ void __init bcm63xx_cpu_init(void)
184 bcm63xx_cpu_variant = bcm63xx_cpu_id;
185
186 switch (bcm63xx_cpu_id) {
187 + case BCM6318_CPU_ID:
188 + bcm63xx_regs_base = bcm6318_regs_base;
189 + bcm63xx_irqs = bcm6318_irqs;
190 + break;
191 case BCM3368_CPU_ID:
192 bcm63xx_regs_base = bcm3368_regs_base;
193 bcm63xx_irqs = bcm3368_irqs;
194 --- a/arch/mips/bcm63xx/dev-flash.c
195 +++ b/arch/mips/bcm63xx/dev-flash.c
196 @@ -60,6 +60,9 @@ static int __init bcm63xx_detect_flash_t
197 u32 val;
198
199 switch (bcm63xx_get_cpu_id()) {
200 + case BCM6318_CPU_ID:
201 + /* only support serial flash */
202 + return BCM63XX_FLASH_TYPE_SERIAL;
203 case BCM6328_CPU_ID:
204 val = bcm_misc_readl(MISC_STRAPBUS_6328_REG);
205 if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
206 --- a/arch/mips/bcm63xx/dev-spi.c
207 +++ b/arch/mips/bcm63xx/dev-spi.c
208 @@ -38,7 +38,7 @@ static struct platform_device bcm63xx_sp
209
210 int __init bcm63xx_spi_register(void)
211 {
212 - if (BCMCPU_IS_6328() || BCMCPU_IS_6345())
213 + if (BCMCPU_IS_6318() || BCMCPU_IS_6328() || BCMCPU_IS_6345())
214 return -ENODEV;
215
216 spi_resources[0].start = bcm63xx_regset_address(RSET_SPI);
217 --- a/arch/mips/bcm63xx/irq.c
218 +++ b/arch/mips/bcm63xx/irq.c
219 @@ -48,6 +48,19 @@ void __init arch_init_irq(void)
220 ext_irqs[3] = BCM_3368_EXT_IRQ3;
221 ext_shift = 4;
222 break;
223 + case BCM6318_CPU_ID:
224 + periph_bases[0] += PERF_IRQMASK_6318_REG;
225 + periph_irq_count = 1;
226 + periph_width = 4;
227 +
228 + ext_intc_bases[0] += PERF_EXTIRQ_CFG_REG_6318;
229 + ext_irq_count = 4;
230 + ext_irqs[0] = BCM_6318_EXT_IRQ0;
231 + ext_irqs[1] = BCM_6318_EXT_IRQ0;
232 + ext_irqs[2] = BCM_6318_EXT_IRQ0;
233 + ext_irqs[3] = BCM_6318_EXT_IRQ0;
234 + ext_shift = 4;
235 + break;
236 case BCM6328_CPU_ID:
237 periph_bases[0] += PERF_IRQMASK_6328_REG(0);
238 periph_bases[1] += PERF_IRQMASK_6328_REG(1);
239 --- a/arch/mips/bcm63xx/prom.c
240 +++ b/arch/mips/bcm63xx/prom.c
241 @@ -68,7 +68,7 @@ void __init prom_init(void)
242
243 if (reg & OTP_6328_REG3_TP1_DISABLED)
244 bmips_smp_enabled = 0;
245 - } else if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
246 + } else if (BCMCPU_IS_6318() || BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
247 bmips_smp_enabled = 0;
248 }
249
250 --- a/arch/mips/bcm63xx/reset.c
251 +++ b/arch/mips/bcm63xx/reset.c
252 @@ -44,6 +44,23 @@
253 #define BCM3368_RESET_PCIE 0
254 #define BCM3368_RESET_PCIE_EXT 0
255
256 +
257 +#define BCM6318_RESET_SPI SOFTRESET_6318_SPI_MASK
258 +#define BCM6318_RESET_ENET 0
259 +#define BCM6318_RESET_USBH SOFTRESET_6318_USBH_MASK
260 +#define BCM6318_RESET_USBD SOFTRESET_6318_USBS_MASK
261 +#define BCM6318_RESET_DSL 0
262 +#define BCM6318_RESET_SAR SOFTRESET_6318_SAR_MASK
263 +#define BCM6318_RESET_EPHY SOFTRESET_6318_EPHY_MASK
264 +#define BCM6318_RESET_ENETSW SOFTRESET_6318_ENETSW_MASK
265 +#define BCM6318_RESET_PCM 0
266 +#define BCM6318_RESET_MPI 0
267 +#define BCM6318_RESET_PCIE \
268 + (SOFTRESET_6318_PCIE_MASK | \
269 + SOFTRESET_6318_PCIE_CORE_MASK | \
270 + SOFTRESET_6318_PCIE_HARD_MASK)
271 +#define BCM6318_RESET_PCIE_EXT SOFTRESET_6318_PCIE_EXT_MASK
272 +
273 #define BCM6328_RESET_SPI SOFTRESET_6328_SPI_MASK
274 #define BCM6328_RESET_ENET 0
275 #define BCM6328_RESET_USBH SOFTRESET_6328_USBH_MASK
276 @@ -148,6 +165,10 @@ static const u32 bcm3368_reset_bits[] =
277 __GEN_RESET_BITS_TABLE(3368)
278 };
279
280 +static const u32 bcm6318_reset_bits[] = {
281 + __GEN_RESET_BITS_TABLE(6318)
282 +};
283 +
284 static const u32 bcm6328_reset_bits[] = {
285 __GEN_RESET_BITS_TABLE(6328)
286 };
287 @@ -184,6 +205,9 @@ static int __init bcm63xx_reset_bits_ini
288 if (BCMCPU_IS_3368()) {
289 reset_reg = PERF_SOFTRESET_6358_REG;
290 bcm63xx_reset_bits = bcm3368_reset_bits;
291 + } else if (BCMCPU_IS_6318()) {
292 + reset_reg = PERF_SOFTRESET_6318_REG;
293 + bcm63xx_reset_bits = bcm6318_reset_bits;
294 } else if (BCMCPU_IS_6328()) {
295 reset_reg = PERF_SOFTRESET_6328_REG;
296 bcm63xx_reset_bits = bcm6328_reset_bits;
297 --- a/arch/mips/bcm63xx/setup.c
298 +++ b/arch/mips/bcm63xx/setup.c
299 @@ -72,6 +72,9 @@ void bcm63xx_machine_reboot(void)
300 case BCM3368_CPU_ID:
301 perf_regs[0] = PERF_EXTIRQ_CFG_REG_3368;
302 break;
303 + case BCM6318_CPU_ID:
304 + perf_regs[0] = PERF_EXTIRQ_CFG_REG_6318;
305 + break;
306 case BCM6328_CPU_ID:
307 perf_regs[0] = PERF_EXTIRQ_CFG_REG_6328;
308 break;
309 @@ -111,7 +114,7 @@ void bcm63xx_machine_reboot(void)
310 bcm6348_a1_reboot();
311
312 pr_info("triggering watchdog soft-reset...\n");
313 - if (BCMCPU_IS_6328()) {
314 + if (BCMCPU_IS_6318() || BCMCPU_IS_6328()) {
315 bcm_wdt_writel(1, WDT_SOFTRESET_REG);
316 } else {
317 reg = bcm_perf_readl(PERF_SYS_PLL_CTL_REG);
318 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
319 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
320 @@ -11,6 +11,7 @@
321 * arm mach-types)
322 */
323 #define BCM3368_CPU_ID 0x3368
324 +#define BCM6318_CPU_ID 0x6318
325 #define BCM6328_CPU_ID 0x6328
326 #define BCM63281_CPU_ID 0x63281
327 #define BCM63283_CPU_ID 0x63283
328 @@ -39,6 +40,10 @@ static inline u32 __pure __bcm63xx_get_c
329 case BCM3368_CPU_ID:
330 #endif
331
332 +#ifdef CONFIG_BCM63XX_CPU_6318
333 + case BCM6318_CPU_ID:
334 +#endif
335 +
336 #ifdef CONFIG_BCM63XX_CPU_6328
337 case BCM6328_CPU_ID:
338 #endif
339 @@ -88,6 +93,7 @@ static inline u32 __pure bcm63xx_get_cpu
340 }
341
342 #define BCMCPU_IS_3368() (bcm63xx_get_cpu_id() == BCM3368_CPU_ID)
343 +#define BCMCPU_IS_6318() (bcm63xx_get_cpu_id() == BCM6318_CPU_ID)
344 #define BCMCPU_IS_6328() (bcm63xx_get_cpu_id() == BCM6328_CPU_ID)
345 #define BCMCPU_IS_6338() (bcm63xx_get_cpu_id() == BCM6338_CPU_ID)
346 #define BCMCPU_IS_6345() (bcm63xx_get_cpu_id() == BCM6345_CPU_ID)
347 @@ -99,6 +105,8 @@ static inline u32 __pure bcm63xx_get_cpu
348
349 #define BCMCPU_VARIANT_IS_3368() \
350 (bcm63xx_get_cpu_variant() == BCM3368_CPU_ID)
351 +#define BCMCPU_VARIANT_IS_6318() \
352 + (bcm63xx_get_cpu_variant() == BCM6318_CPU_ID)
353 #define BCMCPU_VARIANT_IS_63281() \
354 (bcm63xx_get_cpu_variant() == BCM63281_CPU_ID)
355 #define BCMCPU_VARIANT_IS_63283() \
356 @@ -253,6 +261,56 @@ enum bcm63xx_regs_set {
357 #define BCM_3368_MISC_BASE (0xdeadbeef)
358
359 /*
360 + * 6318 register sets base address
361 + */
362 +#define BCM_6318_DSL_LMEM_BASE (0xdeadbeef)
363 +#define BCM_6318_PERF_BASE (0xb0000000)
364 +#define BCM_6318_TIMER_BASE (0xb0000040)
365 +#define BCM_6318_WDT_BASE (0xb0000068)
366 +#define BCM_6318_UART0_BASE (0xb0000100)
367 +#define BCM_6318_UART1_BASE (0xdeadbeef)
368 +#define BCM_6318_GPIO_BASE (0xb0000080)
369 +#define BCM_6318_SPI_BASE (0xdeadbeef)
370 +#define BCM_6318_HSSPI_BASE (0xb0003000)
371 +#define BCM_6318_UDC0_BASE (0xdeadbeef)
372 +#define BCM_6318_USBDMA_BASE (0xb0006800)
373 +#define BCM_6318_OHCI0_BASE (0xb0005100)
374 +#define BCM_6318_OHCI_PRIV_BASE (0xdeadbeef)
375 +#define BCM_6318_USBH_PRIV_BASE (0xb0005200)
376 +#define BCM_6318_USBD_BASE (0xb0006000)
377 +#define BCM_6318_MPI_BASE (0xdeadbeef)
378 +#define BCM_6318_PCMCIA_BASE (0xdeadbeef)
379 +#define BCM_6318_PCIE_BASE (0xb0010000)
380 +#define BCM_6318_SDRAM_REGS_BASE (0xdeadbeef)
381 +#define BCM_6318_DSL_BASE (0xdeadbeef)
382 +#define BCM_6318_UBUS_BASE (0xdeadbeef)
383 +#define BCM_6318_ENET0_BASE (0xdeadbeef)
384 +#define BCM_6318_ENET1_BASE (0xdeadbeef)
385 +#define BCM_6318_ENETDMA_BASE (0xb0088000)
386 +#define BCM_6318_ENETDMAC_BASE (0xb0088200)
387 +#define BCM_6318_ENETDMAS_BASE (0xb0088400)
388 +#define BCM_6318_ENETSW_BASE (0xb0080000)
389 +#define BCM_6318_EHCI0_BASE (0xb0005000)
390 +#define BCM_6318_SDRAM_BASE (0xb0004000)
391 +#define BCM_6318_MEMC_BASE (0xdeadbeef)
392 +#define BCM_6318_DDR_BASE (0xdeadbeef)
393 +#define BCM_6318_M2M_BASE (0xdeadbeef)
394 +#define BCM_6318_ATM_BASE (0xdeadbeef)
395 +#define BCM_6318_XTM_BASE (0xdeadbeef)
396 +#define BCM_6318_XTMDMA_BASE (0xb000c000)
397 +#define BCM_6318_XTMDMAC_BASE (0xdeadbeef)
398 +#define BCM_6318_XTMDMAS_BASE (0xdeadbeef)
399 +#define BCM_6318_PCM_BASE (0xdeadbeef)
400 +#define BCM_6318_PCMDMA_BASE (0xdeadbeef)
401 +#define BCM_6318_PCMDMAC_BASE (0xdeadbeef)
402 +#define BCM_6318_PCMDMAS_BASE (0xdeadbeef)
403 +#define BCM_6318_RNG_BASE (0xdeadbeef)
404 +#define BCM_6318_MISC_BASE (0xb0000280)
405 +#define BCM_6318_OTP_BASE (0xdeadbeef)
406 +
407 +#define BCM_6318_STRAP_BASE (0xb0000900)
408 +
409 +/*
410 * 6328 register sets base address
411 */
412 #define BCM_6328_DSL_LMEM_BASE (0xdeadbeef)
413 @@ -775,6 +833,55 @@ enum bcm63xx_irq {
414 #define BCM_3368_EXT_IRQ2 (IRQ_INTERNAL_BASE + 27)
415 #define BCM_3368_EXT_IRQ3 (IRQ_INTERNAL_BASE + 28)
416
417 +/*
418 + * 6318 irqs
419 + */
420 +#define BCM_6318_HIGH_IRQ_BASE (IRQ_INTERNAL_BASE + 32)
421 +#define BCM_6318_VERY_HIGH_IRQ_BASE (BCM_6318_HIGH_IRQ_BASE + 32)
422 +
423 +#define BCM_6318_TIMER_IRQ (IRQ_INTERNAL_BASE + 31)
424 +#define BCM_6318_SPI_IRQ 0
425 +#define BCM_6318_UART0_IRQ (IRQ_INTERNAL_BASE + 28)
426 +#define BCM_6318_UART1_IRQ 0
427 +#define BCM_6318_DSL_IRQ (IRQ_INTERNAL_BASE + 21)
428 +#define BCM_6318_UDC0_IRQ 0
429 +#define BCM_6318_ENET0_IRQ 0
430 +#define BCM_6318_ENET1_IRQ 0
431 +#define BCM_6318_ENET_PHY_IRQ (IRQ_INTERNAL_BASE + 12)
432 +#define BCM_6318_HSSPI_IRQ (IRQ_INTERNAL_BASE + 29)
433 +#define BCM_6318_OHCI0_IRQ (BCM_6318_HIGH_IRQ_BASE + 9)
434 +#define BCM_6318_EHCI0_IRQ (BCM_6318_HIGH_IRQ_BASE + 10)
435 +#define BCM_6318_USBD_IRQ (IRQ_INTERNAL_BASE + 4)
436 +#define BCM_6318_USBD_RXDMA0_IRQ (IRQ_INTERNAL_BASE + 5)
437 +#define BCM_6318_USBD_TXDMA0_IRQ (IRQ_INTERNAL_BASE + 6)
438 +#define BCM_6318_USBD_RXDMA1_IRQ (IRQ_INTERNAL_BASE + 7)
439 +#define BCM_6318_USBD_TXDMA1_IRQ (IRQ_INTERNAL_BASE + 8)
440 +#define BCM_6318_USBD_RXDMA2_IRQ (IRQ_INTERNAL_BASE + 9)
441 +#define BCM_6318_USBD_TXDMA2_IRQ (IRQ_INTERNAL_BASE + 10)
442 +#define BCM_6318_PCMCIA_IRQ 0
443 +#define BCM_6318_ENET0_RXDMA_IRQ 0
444 +#define BCM_6318_ENET0_TXDMA_IRQ 0
445 +#define BCM_6318_ENET1_RXDMA_IRQ 0
446 +#define BCM_6318_ENET1_TXDMA_IRQ 0
447 +#define BCM_6318_PCI_IRQ (IRQ_INTERNAL_BASE + 23)
448 +#define BCM_6318_ATM_IRQ 0
449 +#define BCM_6318_ENETSW_RXDMA0_IRQ (BCM_6318_HIGH_IRQ_BASE + 0)
450 +#define BCM_6318_ENETSW_RXDMA1_IRQ (BCM_6318_HIGH_IRQ_BASE + 1)
451 +#define BCM_6318_ENETSW_RXDMA2_IRQ (BCM_6318_HIGH_IRQ_BASE + 2)
452 +#define BCM_6318_ENETSW_RXDMA3_IRQ (BCM_6318_HIGH_IRQ_BASE + 3)
453 +#define BCM_6318_ENETSW_TXDMA0_IRQ (BCM_6318_VERY_HIGH_IRQ_BASE + 10)
454 +#define BCM_6318_ENETSW_TXDMA1_IRQ (BCM_6318_VERY_HIGH_IRQ_BASE + 11)
455 +#define BCM_6318_ENETSW_TXDMA2_IRQ (BCM_6318_VERY_HIGH_IRQ_BASE + 12)
456 +#define BCM_6318_ENETSW_TXDMA3_IRQ (BCM_6318_VERY_HIGH_IRQ_BASE + 13)
457 +#define BCM_6318_XTM_IRQ (BCM_6318_HIGH_IRQ_BASE + 31)
458 +#define BCM_6318_XTM_DMA0_IRQ (BCM_6318_HIGH_IRQ_BASE + 11)
459 +
460 +#define BCM_6318_PCM_DMA0_IRQ (IRQ_INTERNAL_BASE + 2)
461 +#define BCM_6318_PCM_DMA1_IRQ (IRQ_INTERNAL_BASE + 3)
462 +#define BCM_6318_EXT_IRQ0 (IRQ_INTERNAL_BASE + 24)
463 +#define BCM_6318_EXT_IRQ1 (IRQ_INTERNAL_BASE + 25)
464 +#define BCM_6318_EXT_IRQ2 (IRQ_INTERNAL_BASE + 26)
465 +#define BCM_6318_EXT_IRQ3 (IRQ_INTERNAL_BASE + 27)
466
467 /*
468 * 6328 irqs
469 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
470 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
471 @@ -53,6 +53,39 @@
472 CKCTL_3368_EMUSB_EN | \
473 CKCTL_3368_USBU_EN)
474
475 +#define CKCTL_6318_ADSL_ASB_EN (1 << 0)
476 +#define CKCTL_6318_USB_ASB_EN (1 << 1)
477 +#define CKCTL_6318_MIPS_ASB_EN (1 << 2)
478 +#define CKCTL_6318_PCIE_ASB_EN (1 << 3)
479 +#define CKCTL_6318_PHYMIPS_ASB_EN (1 << 4)
480 +#define CKCTL_6318_ROBOSW_ASB_EN (1 << 5)
481 +#define CKCTL_6318_SAR_ASB_EN (1 << 6)
482 +#define CKCTL_6318_SDR_ASB_EN (1 << 7)
483 +#define CKCTL_6318_SWREG_ASB_EN (1 << 8)
484 +#define CKCTL_6318_PERIPH_ASB_EN (1 << 9)
485 +#define CKCTL_6318_CPUBUS160_EN (1 << 10)
486 +#define CKCTL_6318_ADSL_EN (1 << 11)
487 +#define CKCTL_6318_SAR125_EN (1 << 12)
488 +#define CKCTL_6318_MIPS_EN (1 << 13)
489 +#define CKCTL_6318_PCIE_EN (1 << 14)
490 +#define CKCTL_6318_ROBOSW250_EN (1 << 16)
491 +#define CKCTL_6318_ROBOSW025_EN (1 << 17)
492 +#define CKCTL_6318_SDR_EN (1 << 19)
493 +#define CKCTL_6318_USB_EN (1 << 20) /* both device and host */
494 +#define CKCTL_6318_HSSPI_EN (1 << 25)
495 +#define CKCTL_6318_PCIE25_EN (1 << 27)
496 +#define CKCTL_6318_PHYMIPS_EN (1 << 28)
497 +#define CKCTL_6318_ADSL_AFE_EN (1 << 29)
498 +#define CKCTL_6318_ADSL_QPROC_EN (1 << 30)
499 +
500 +#define CKCTL_6318_ALL_SAFE_EN (CKCTL_6318_PHYMIPS_EN | \
501 + CKCTL_6318_ADSL_QPROC_EN | \
502 + CKCTL_6318_ADSL_AFE_EN | \
503 + CKCTL_6318_ADSL_EN | \
504 + CKCTL_6318_SAR_EN | \
505 + CKCTL_6318_USB_EN | \
506 + CKCTL_6318_PCIE_EN)
507 +
508 #define CKCTL_6328_PHYMIPS_EN (1 << 0)
509 #define CKCTL_6328_ADSL_QPROC_EN (1 << 1)
510 #define CKCTL_6328_ADSL_AFE_EN (1 << 2)
511 @@ -260,12 +293,27 @@
512 CKCTL_63268_TBUS_EN | \
513 CKCTL_63268_ROBOSW250_EN)
514
515 +/* UBUS Clock Control register */
516 +#define PERF_UB_CKCTL_REG 0x10
517 +
518 +#define UB_CKCTL_6318_ADSL_EN (1 << 0)
519 +#define UB_CKCTL_6318_ARB_EN (1 << 1)
520 +#define UB_CKCTL_6318_MIPS_EN (1 << 2)
521 +#define UB_CKCTL_6318_PCIE_EN (1 << 3)
522 +#define UB_CKCTL_6318_PERIPH_EN (1 << 4)
523 +#define UB_CKCTL_6318_PHYMIPS_EN (1 << 5)
524 +#define UB_CKCTL_6318_ROBOSW_EN (1 << 6)
525 +#define UB_CKCTL_6318_SAR_EN (1 << 7)
526 +#define UB_CKCTL_6318_SDR_EN (1 << 8)
527 +#define UB_CKCTL_6318_USB_EN (1 << 9)
528 +
529 /* System PLL Control register */
530 #define PERF_SYS_PLL_CTL_REG 0x8
531 #define SYS_PLL_SOFT_RESET 0x1
532
533 /* Interrupt Mask register */
534 #define PERF_IRQMASK_3368_REG 0xc
535 +#define PERF_IRQMASK_6318_REG 0x20
536 #define PERF_IRQMASK_6328_REG(x) (0x20 + (x) * 0x10)
537 #define PERF_IRQMASK_6338_REG 0xc
538 #define PERF_IRQMASK_6345_REG 0xc
539 @@ -277,6 +325,7 @@
540
541 /* Interrupt Status register */
542 #define PERF_IRQSTAT_3368_REG 0x10
543 +#define PERF_IRQSTAT_6318_REG 0x30
544 #define PERF_IRQSTAT_6328_REG(x) (0x28 + (x) * 0x10)
545 #define PERF_IRQSTAT_6338_REG 0x10
546 #define PERF_IRQSTAT_6345_REG 0x10
547 @@ -288,6 +337,7 @@
548
549 /* External Interrupt Configuration register */
550 #define PERF_EXTIRQ_CFG_REG_3368 0x14
551 +#define PERF_EXTIRQ_CFG_REG_6318 0x18
552 #define PERF_EXTIRQ_CFG_REG_6328 0x18
553 #define PERF_EXTIRQ_CFG_REG_6338 0x14
554 #define PERF_EXTIRQ_CFG_REG_6345 0x14
555 @@ -322,6 +372,7 @@
556
557 /* Soft Reset register */
558 #define PERF_SOFTRESET_REG 0x28
559 +#define PERF_SOFTRESET_6318_REG 0x10
560 #define PERF_SOFTRESET_6328_REG 0x10
561 #define PERF_SOFTRESET_6358_REG 0x34
562 #define PERF_SOFTRESET_6362_REG 0x10
563 @@ -335,6 +386,18 @@
564 #define SOFTRESET_3368_USBS_MASK (1 << 11)
565 #define SOFTRESET_3368_PCM_MASK (1 << 13)
566
567 +#define SOFTRESET_6318_SPI_MASK (1 << 0)
568 +#define SOFTRESET_6318_EPHY_MASK (1 << 1)
569 +#define SOFTRESET_6318_SAR_MASK (1 << 2)
570 +#define SOFTRESET_6318_ENETSW_MASK (1 << 3)
571 +#define SOFTRESET_6318_USBS_MASK (1 << 4)
572 +#define SOFTRESET_6318_USBH_MASK (1 << 5)
573 +#define SOFTRESET_6318_PCIE_CORE_MASK (1 << 6)
574 +#define SOFTRESET_6318_PCIE_MASK (1 << 7)
575 +#define SOFTRESET_6318_PCIE_EXT_MASK (1 << 8)
576 +#define SOFTRESET_6318_PCIE_HARD_MASK (1 << 9)
577 +#define SOFTRESET_6318_ADSL_MASK (1 << 10)
578 +
579 #define SOFTRESET_6328_SPI_MASK (1 << 0)
580 #define SOFTRESET_6328_EPHY_MASK (1 << 1)
581 #define SOFTRESET_6328_SAR_MASK (1 << 2)
582 @@ -506,8 +569,17 @@
583 #define TIMER_IRQSTAT_TIMER1_IR_EN (1 << 9)
584 #define TIMER_IRQSTAT_TIMER2_IR_EN (1 << 10)
585
586 +#define TIMER_IRQMASK_6318_REG 0x0
587 +#define TIMER_IRQSTAT_6318_REG 0x4
588 +#define IRQSTATMASK_TIMER0 (1 << 0)
589 +#define IRQSTATMASK_TIMER1 (1 << 1)
590 +#define IRQSTATMASK_TIMER2 (1 << 2)
591 +#define IRQSTATMASK_TIMER3 (1 << 3)
592 +#define IRQSTATMASK_WDT (1 << 4)
593 +
594 /* Timer control register */
595 #define TIMER_CTLx_REG(x) (0x4 + (x * 4))
596 +#define TIMER_CTRx_6318_REG(x) (0x8 + (x * 4))
597 #define TIMER_CTL0_REG 0x4
598 #define TIMER_CTL1_REG 0x8
599 #define TIMER_CTL2_REG 0xC
600 @@ -1254,6 +1326,8 @@
601 #define SDRAM_CFG_32B_MASK (1 << SDRAM_CFG_32B_SHIFT)
602 #define SDRAM_CFG_BANK_SHIFT 13
603 #define SDRAM_CFG_BANK_MASK (1 << SDRAM_CFG_BANK_SHIFT)
604 +#define SDRAM_CFG_6318_SPACE_SHIFT 4
605 +#define SDRAM_CFG_6318_SPACE_MASK (0xf << SDRAM_CFG_6318_SPACE_SHIFT)
606
607 #define SDRAM_MBASE_REG 0xc
608
609 --- a/arch/mips/include/asm/mach-bcm63xx/ioremap.h
610 +++ b/arch/mips/include/asm/mach-bcm63xx/ioremap.h
611 @@ -23,6 +23,7 @@ static inline int is_bcm63xx_internal_re
612 if (offset >= 0xfff00000)
613 return 1;
614 break;
615 + case BCM6318_CPU_ID:
616 case BCM6328_CPU_ID:
617 case BCM6362_CPU_ID:
618 case BCM6368_CPU_ID:
619 --- a/arch/mips/bcm63xx/dev-hsspi.c
620 +++ b/arch/mips/bcm63xx/dev-hsspi.c
621 @@ -35,7 +35,8 @@ static struct platform_device bcm63xx_hs
622
623 int __init bcm63xx_hsspi_register(void)
624 {
625 - if (!BCMCPU_IS_6328() && !BCMCPU_IS_6362() && !BCMCPU_IS_63268())
626 + if (!BCMCPU_IS_6318() && !BCMCPU_IS_6328() && !BCMCPU_IS_6362() &&
627 + !BCMCPU_IS_63268())
628 return -ENODEV;
629
630 spi_resources[0].start = bcm63xx_regset_address(RSET_HSSPI);
631 --- a/arch/mips/bcm63xx/dev-usb-usbd.c
632 +++ b/arch/mips/bcm63xx/dev-usb-usbd.c
633 @@ -41,7 +41,7 @@ int __init bcm63xx_usbd_register(const s
634 IRQ_USBD_RXDMA2, IRQ_USBD_TXDMA2 };
635 int i;
636
637 - if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
638 + if (!BCMCPU_IS_6318() && !BCMCPU_IS_6328() && !BCMCPU_IS_6368())
639 return 0;
640
641 usbd_resources[0].start = bcm63xx_regset_address(RSET_USBD);
642 --- a/arch/mips/bcm63xx/dev-enet.c
643 +++ b/arch/mips/bcm63xx/dev-enet.c
644 @@ -184,8 +184,8 @@ static int __init register_shared(void)
645 else
646 shared_res[0].end += (RSET_ENETDMA_SIZE) - 1;
647
648 - if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_6368() ||
649 - BCMCPU_IS_63268())
650 + if (BCMCPU_IS_6318() || BCMCPU_IS_6328() || BCMCPU_IS_6362() ||
651 + BCMCPU_IS_6368() || BCMCPU_IS_63268())
652 chan_count = 32;
653 else if (BCMCPU_IS_6345())
654 chan_count = 8;
655 @@ -293,8 +293,8 @@ bcm63xx_enetsw_register(const struct bcm
656 {
657 int ret;
658
659 - if (!BCMCPU_IS_6328() && !BCMCPU_IS_6362() && !BCMCPU_IS_6368() &&
660 - !BCMCPU_IS_63268())
661 + if (!BCMCPU_IS_6318() && !BCMCPU_IS_6328() && !BCMCPU_IS_6362() &&
662 + !BCMCPU_IS_6368() && !BCMCPU_IS_63268())
663 return -ENODEV;
664
665 ret = register_shared();
666 @@ -311,7 +311,7 @@ bcm63xx_enetsw_register(const struct bcm
667
668 memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof(*pd));
669
670 - if (BCMCPU_IS_6328())
671 + if (BCMCPU_IS_6318() || BCMCPU_IS_6328())
672 enetsw_pd.num_ports = ENETSW_PORTS_6328;
673 else if (BCMCPU_IS_6362() || BCMCPU_IS_6368())
674 enetsw_pd.num_ports = ENETSW_PORTS_6368;
675 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
676 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
677 @@ -10,6 +10,8 @@ int __init bcm63xx_gpio_init(void);
678 static inline unsigned long bcm63xx_gpio_count(void)
679 {
680 switch (bcm63xx_get_cpu_id()) {
681 + case BCM6318_CPU_ID:
682 + return 50;
683 case BCM6328_CPU_ID:
684 return 32;
685 case BCM3368_CPU_ID:
686 --- a/arch/mips/bcm63xx/dev-usb-ehci.c
687 +++ b/arch/mips/bcm63xx/dev-usb-ehci.c
688 @@ -81,7 +81,8 @@ static struct platform_device bcm63xx_eh
689
690 int __init bcm63xx_ehci_register(void)
691 {
692 - if (!BCMCPU_IS_6328() && !BCMCPU_IS_6358() && !BCMCPU_IS_6362() && !BCMCPU_IS_6368())
693 + if (!BCMCPU_IS_6318() && !BCMCPU_IS_6328() && !BCMCPU_IS_6358() &&
694 + !BCMCPU_IS_6362() && !BCMCPU_IS_6368())
695 return 0;
696
697 ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0);
Staging tree of Zoltan Herpai