projects / openwrt / staging / dedeckeh.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
uboot-lantiq/spl: fixed uninitialized variable len in spl_uncompress_lzo
[openwrt/staging/dedeckeh.git] / package / boot / uboot-lantiq / patches / 0015-MIPS-lantiq-add-support-for-Lantiq-XWAY-ARX100-SoC-f.patch
1 From 4953294aa8f8b9023e6b5f7f39059706c72d916c Mon Sep 17 00:00:00 2001
2 From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
3 Date: Sun, 9 Dec 2012 17:54:56 +0100
4 Subject: MIPS: lantiq: add support for Lantiq XWAY ARX100 SoC family
5
6 Signed-off-by: Luka Perkov <luka@openwrt.org>
7 Signed-off-by: John Crispin <blogic@openwrt.org>
8 Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
9
10 --- /dev/null
11 +++ b/arch/mips/cpu/mips32/arx100/Makefile
12 @@ -0,0 +1,31 @@
13 +#
14 +# Copyright (C) 2000-2011 Wolfgang Denk, DENX Software Engineering, wd@denx.de
15 +#
16 +# SPDX-License-Identifier: GPL-2.0+
17 +#
18 +
19 +include $(TOPDIR)/config.mk
20 +
21 +LIB = $(obj)lib$(SOC).o
22 +
23 +COBJS-y += cgu.o chipid.o ebu.o mem.o pmu.o rcu.o
24 +SOBJS-y += cgu_init.o mem_init.o
25 +
26 +COBJS := $(COBJS-y)
27 +SOBJS := $(SOBJS-y)
28 +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
29 +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
30 +
31 +all: $(LIB)
32 +
33 +$(LIB): $(obj).depend $(OBJS)
34 + $(call cmd_link_o_target, $(OBJS))
35 +
36 +#########################################################################
37 +
38 +# defines $(obj).depend target
39 +include $(SRCTREE)/rules.mk
40 +
41 +sinclude $(obj).depend
42 +
43 +#########################################################################
44 --- /dev/null
45 +++ b/arch/mips/cpu/mips32/arx100/cgu.c
46 @@ -0,0 +1,109 @@
47 +/*
48 + * Copyright (C) 2007-2010 Lantiq Deutschland GmbH
49 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
50 + *
51 + * SPDX-License-Identifier: GPL-2.0+
52 + */
53 +
54 +#include <common.h>
55 +#include <asm/arch/soc.h>
56 +#include <asm/lantiq/clk.h>
57 +#include <asm/lantiq/io.h>
58 +
59 +#define CGU_SYS_DDR_SEL (1 << 0)
60 +#define CGU_SYS_CPU_SEL (1 << 2)
61 +#define CGU_SYS_SYS_SHIFT 3
62 +#define CGU_SYS_SYS_MASK (0x3 << CGU_SYS_SYS_SHIFT)
63 +#define CGU_SYS_FPI_SEL (1 << 6)
64 +#define CGU_SYS_PPE_SEL (1 << 7)
65 +
66 +struct ltq_cgu_regs {
67 + u32 rsvd0;
68 + __be32 pll0_cfg; /* PLL0 config */
69 + __be32 pll1_cfg; /* PLL1 config */
70 + u32 rsvd2;
71 + __be32 sys; /* System clock */
72 + __be32 update; /* CGU update control */
73 + __be32 if_clk; /* Interface clock */
74 + u32 rsvd3;
75 + __be32 smd; /* SDRAM Memory Control */
76 + u32 rsvd4;
77 + __be32 ct1_sr; /* CT status 1 */
78 + __be32 ct_kval; /* CT K value */
79 + __be32 pcm_cr; /* PCM control */
80 +};
81 +
82 +static struct ltq_cgu_regs *ltq_cgu_regs =
83 + (struct ltq_cgu_regs *) CKSEG1ADDR(LTQ_CGU_BASE);
84 +
85 +static inline u32 ltq_cgu_sys_readl(u32 mask, u32 shift)
86 +{
87 + return (ltq_readl(&ltq_cgu_regs->sys) & mask) >> shift;
88 +}
89 +
90 +static unsigned long ltq_get_system_clock(void)
91 +{
92 + u32 sys_sel;
93 + unsigned long clk;
94 +
95 + sys_sel = ltq_cgu_sys_readl(CGU_SYS_SYS_MASK, CGU_SYS_SYS_SHIFT);
96 +
97 + switch (sys_sel) {
98 + case 0:
99 + clk = CLOCK_333_MHZ;
100 + break;
101 + case 2:
102 + clk = CLOCK_393_MHZ;
103 + break;
104 + default:
105 + clk = 0;
106 + break;
107 + }
108 +
109 + return clk;
110 +}
111 +
112 +unsigned long ltq_get_io_region_clock(void)
113 +{
114 + u32 ddr_sel;
115 + unsigned long clk;
116 +
117 + ddr_sel = ltq_cgu_sys_readl(1, CGU_SYS_DDR_SEL);
118 +
119 + if (ddr_sel)
120 + clk = ltq_get_system_clock() / 3;
121 + else
122 + clk = ltq_get_system_clock() / 2;
123 +
124 + return clk;
125 +}
126 +
127 +unsigned long ltq_get_cpu_clock(void)
128 +{
129 + u32 cpu_sel;
130 + unsigned long clk;
131 +
132 + cpu_sel = ltq_cgu_sys_readl(1, CGU_SYS_CPU_SEL);
133 +
134 + if (cpu_sel)
135 + clk = ltq_get_io_region_clock();
136 + else
137 + clk = ltq_get_system_clock();
138 +
139 + return clk;
140 +}
141 +
142 +unsigned long ltq_get_bus_clock(void)
143 +{
144 + u32 fpi_sel;
145 + unsigned long clk;
146 +
147 + fpi_sel = ltq_cgu_sys_readl(1, CGU_SYS_FPI_SEL);
148 +
149 + if (fpi_sel)
150 + clk = ltq_get_io_region_clock() / 2;
151 + else
152 + clk = ltq_get_io_region_clock();
153 +
154 + return clk;
155 +}
156 --- /dev/null
157 +++ b/arch/mips/cpu/mips32/arx100/cgu_init.S
158 @@ -0,0 +1,105 @@
159 +/*
160 + * Copyright (C) 2007-2010 Lantiq Deutschland GmbH
161 + * Copyright (C) 2012-2013 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
162 + *
163 + * SPDX-License-Identifier: GPL-2.0+
164 + */
165 +
166 +#include <config.h>
167 +#include <asm/asm.h>
168 +#include <asm/regdef.h>
169 +#include <asm/addrspace.h>
170 +#include <asm/arch/soc.h>
171 +
172 +/* CGU module register */
173 +#define CGU_PLL0_CFG 0x0004 /* PLL0 config */
174 +#define CGU_PLL1_CFG 0x0008 /* PLL1 config */
175 +#define CGU_SYS 0x0010 /* System clock */
176 +#define CGU_UPDATE 0x0014 /* Clock update control */
177 +
178 +/* Valid SYS.PPE_SEL values */
179 +#define CGU_SYS_PPESEL_SHIFT 7
180 +#define CGU_SYS_PPESEL_250_MHZ (0x1 << CGU_SYS_PPESEL_SHIFT)
181 +
182 +/* Valid SYS.SYS_SEL values */
183 +#define CGU_SYS_SYSSEL_SHIFT 3
184 +#define CGU_SYS_SYSSEL_PLL0_333_MHZ (0x0 << CGU_SYS_SYSSEL_SHIFT)
185 +#define CGU_SYS_SYSSEL_PLL1_393_MHZ (0x2 << CGU_SYS_SYSSEL_SHIFT)
186 +
187 +/* Valid SYS.CPU_SEL values */
188 +#define CGU_SYS_CPUSEL_SHIFT 2
189 +#define CGU_SYS_CPUSEL_EQUAL_SYSCLK (0x0 << CGU_SYS_CPUSEL_SHIFT)
190 +#define CGU_SYS_CPUSEL_EQUAL_DDRCLK (0x1 << CGU_SYS_CPUSEL_SHIFT)
191 +
192 +/* Valid SYS.DDR_SEL values */
193 +#define CGU_SYS_DDRSEL_HALF_SYSCLK 0x0
194 +#define CGU_SYS_DDRSEL_THIRD_SYSCLK 0x1
195 +
196 +#define CGU_UPDATE_UPD 0x1
197 +
198 +#if (CONFIG_SYS_CLOCK_MODE == LTQ_CLK_CPU_393_DDR_197)
199 +#define CGU_SYS_PPESEL_CONFIG CGU_SYS_PPESEL_250_MHZ
200 +#define CGU_SYS_SYSSEL_CONFIG CGU_SYS_SYSSEL_PLL1_393_MHZ
201 +#define CGU_SYS_CPUSEL_CONFIG CGU_SYS_CPUSEL_EQUAL_SYSCLK
202 +#define CGU_SYS_DDRSEL_CONFIG CGU_SYS_DDRSEL_HALF_SYSCLK
203 +#elif (CONFIG_SYS_CLOCK_MODE == LTQ_CLK_CPU_197_DDR_197)
204 +#define CGU_SYS_PPESEL_CONFIG CGU_SYS_PPESEL_250_MHZ
205 +#define CGU_SYS_SYSSEL_CONFIG CGU_SYS_SYSSEL_PLL1_393_MHZ
206 +#define CGU_SYS_CPUSEL_CONFIG CGU_SYS_CPUSEL_EQUAL_DDRCLK
207 +#define CGU_SYS_DDRSEL_CONFIG CGU_SYS_DDRSEL_HALF_SYSCLK
208 +#elif (CONFIG_SYS_CLOCK_MODE == LTQ_CLK_CPU_333_DDR_167)
209 +#define CGU_SYS_PPESEL_CONFIG CGU_SYS_PPESEL_250_MHZ
210 +#define CGU_SYS_SYSSEL_CONFIG CGU_SYS_SYSSEL_PLL0_333_MHZ
211 +#define CGU_SYS_CPUSEL_CONFIG CGU_SYS_CPUSEL_EQUAL_SYSCLK
212 +#define CGU_SYS_DDRSEL_CONFIG CGU_SYS_DDRSEL_HALF_SYSCLK
213 +#elif (CONFIG_SYS_CLOCK_MODE == LTQ_CLK_CPU_167_DDR_167)
214 +#define CGU_SYS_PPESEL_CONFIG CGU_SYS_PPESEL_250_MHZ
215 +#define CGU_SYS_SYSSEL_CONFIG CGU_SYS_SYSSEL_PLL0_333_MHZ
216 +#define CGU_SYS_CPUSEL_CONFIG CGU_SYS_CPUSEL_EQUAL_DDRCLK
217 +#define CGU_SYS_DDRSEL_CONFIG CGU_SYS_DDRSEL_HALF_SYSCLK
218 +#elif (CONFIG_SYS_CLOCK_MODE == LTQ_CLK_CPU_131_DDR_131)
219 +#define CGU_SYS_PPESEL_CONFIG CGU_SYS_PPESEL_250_MHZ
220 +#define CGU_SYS_SYSSEL_CONFIG CGU_SYS_SYSSEL_PLL1_393_MHZ
221 +#define CGU_SYS_CPUSEL_CONFIG CGU_SYS_CPUSEL_EQUAL_DDRCLK
222 +#define CGU_SYS_DDRSEL_CONFIG CGU_SYS_DDRSEL_THIRD_SYSCLK
223 +#elif (CONFIG_SYS_CLOCK_MODE == LTQ_CLK_CPU_111_DDR_111)
224 +#define CGU_SYS_PPESEL_CONFIG CGU_SYS_PPESEL_250_MHZ
225 +#define CGU_SYS_SYSSEL_CONFIG CGU_SYS_SYSSEL_PLL0_333_MHZ
226 +#define CGU_SYS_CPUSEL_CONFIG CGU_SYS_CPUSEL_EQUAL_DDRCLK
227 +#define CGU_SYS_DDRSEL_CONFIG CGU_SYS_DDRSEL_THIRD_SYSCLK
228 +#else
229 +#error "Invalid system clock configuration!"
230 +#endif
231 +
232 +/* Build register values */
233 +#define CGU_SYS_VALUE (CGU_SYS_PPESEL_CONFIG | \
234 + CGU_SYS_SYSSEL_CONFIG | \
235 + CGU_SYS_CPUSEL_CONFIG | \
236 + CGU_SYS_DDRSEL_CONFIG)
237 +
238 + .set noreorder
239 +
240 +LEAF(ltq_cgu_init)
241 + /* Load current CGU register value */
242 + li t0, (LTQ_CGU_BASE | KSEG1)
243 + lw t1, CGU_SYS(t0)
244 +
245 + /* Load target CGU register values */
246 + li t2, CGU_SYS_VALUE
247 +
248 + /* Only update registers if values differ */
249 + beq t1, t2, finished
250 + nop
251 +
252 + /* Store target register values */
253 + sw t2, CGU_SYS(t0)
254 +
255 + /* Trigger CGU update */
256 + li t1, CGU_UPDATE_UPD
257 + sw t1, CGU_UPDATE(t0)
258 +
259 +finished:
260 + jr ra
261 + nop
262 +
263 + END(ltq_cgu_init)
264 --- /dev/null
265 +++ b/arch/mips/cpu/mips32/arx100/chipid.c
266 @@ -0,0 +1,60 @@
267 +/*
268 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
269 + *
270 + * SPDX-License-Identifier: GPL-2.0+
271 + */
272 +
273 +#include <common.h>
274 +#include <asm/lantiq/io.h>
275 +#include <asm/lantiq/chipid.h>
276 +#include <asm/arch/soc.h>
277 +
278 +#define LTQ_CHIPID_VERSION_SHIFT 28
279 +#define LTQ_CHIPID_VERSION_MASK (0xF << LTQ_CHIPID_VERSION_SHIFT)
280 +#define LTQ_CHIPID_PNUM_SHIFT 12
281 +#define LTQ_CHIPID_PNUM_MASK (0xFFFF << LTQ_CHIPID_PNUM_SHIFT)
282 +
283 +struct ltq_chipid_regs {
284 + u32 manid; /* Manufacturer identification */
285 + u32 chipid; /* Chip identification */
286 +};
287 +
288 +static struct ltq_chipid_regs *ltq_chipid_regs =
289 + (struct ltq_chipid_regs *) CKSEG1ADDR(LTQ_CHIPID_BASE);
290 +
291 +unsigned int ltq_chip_version_get(void)
292 +{
293 + u32 chipid;
294 +
295 + chipid = ltq_readl(&ltq_chipid_regs->chipid);
296 +
297 + return (chipid & LTQ_CHIPID_VERSION_MASK) >> LTQ_CHIPID_VERSION_SHIFT;
298 +}
299 +
300 +unsigned int ltq_chip_partnum_get(void)
301 +{
302 + u32 chipid;
303 +
304 + chipid = ltq_readl(&ltq_chipid_regs->chipid);
305 +
306 + return (chipid & LTQ_CHIPID_PNUM_MASK) >> LTQ_CHIPID_PNUM_SHIFT;
307 +}
308 +
309 +const char *ltq_chip_partnum_str(void)
310 +{
311 + enum ltq_chip_partnum partnum = ltq_chip_partnum_get();
312 +
313 + switch (partnum) {
314 + case LTQ_SOC_ARX188:
315 + return "ARX188";
316 + case LTQ_SOC_ARX186:
317 + case LTQ_SOC_ARX186_2:
318 + return "ARX186";
319 + case LTQ_SOC_ARX182:
320 + return "ARX182";
321 + default:
322 + printf("Unknown partnum: %x\n", partnum);
323 + }
324 +
325 + return "";
326 +}
327 --- /dev/null
328 +++ b/arch/mips/cpu/mips32/arx100/config.mk
329 @@ -0,0 +1,30 @@
330 +#
331 +# Copyright (C) 2011-2013 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
332 +#
333 +# SPDX-License-Identifier: GPL-2.0+
334 +#
335 +
336 +PF_CPPFLAGS_XRX := $(call cc-option,-mtune=34kc,)
337 +PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_XRX)
338 +
339 +ifdef CONFIG_SPL_BUILD
340 +PF_ABICALLS := -mno-abicalls
341 +PF_PIC := -fno-pic
342 +PF_PIE :=
343 +USE_PRIVATE_LIBGCC := yes
344 +endif
345 +
346 +LIBS-y += $(CPUDIR)/lantiq-common/liblantiq-common.o
347 +
348 +ifndef CONFIG_SPL_BUILD
349 +ifdef CONFIG_SYS_BOOT_SFSPL
350 +ALL-y += $(obj)u-boot.ltq.sfspl
351 +ALL-$(CONFIG_SPL_LZO_SUPPORT) += $(obj)u-boot.ltq.lzo.sfspl
352 +ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.sfspl
353 +endif
354 +ifdef CONFIG_SYS_BOOT_NORSPL
355 +ALL-y += $(obj)u-boot.ltq.norspl
356 +ALL-$(CONFIG_SPL_LZO_SUPPORT) += $(obj)u-boot.ltq.lzo.norspl
357 +ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.norspl
358 +endif
359 +endif
360 --- /dev/null
361 +++ b/arch/mips/cpu/mips32/arx100/ebu.c
362 @@ -0,0 +1,111 @@
363 +/*
364 + * Copyright (C) 2011-2013 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
365 + *
366 + * SPDX-License-Identifier: GPL-2.0+
367 + */
368 +
369 +#include <common.h>
370 +#include <asm/arch/soc.h>
371 +#include <asm/lantiq/io.h>
372 +
373 +#define EBU_ADDRSEL_MASK(mask) ((mask & 0xf) << 4)
374 +#define EBU_ADDRSEL_REGEN (1 << 0)
375 +
376 +#define EBU_CON_WRDIS (1 << 31)
377 +#define EBU_CON_AGEN_DEMUX (0x0 << 24)
378 +#define EBU_CON_AGEN_MUX (0x2 << 24)
379 +#define EBU_CON_SETUP (1 << 22)
380 +#define EBU_CON_WAIT_DIS (0x0 << 20)
381 +#define EBU_CON_WAIT_ASYNC (0x1 << 20)
382 +#define EBU_CON_WAIT_SYNC (0x2 << 20)
383 +#define EBU_CON_WINV (1 << 19)
384 +#define EBU_CON_PW_8BIT (0x0 << 16)
385 +#define EBU_CON_PW_16BIT (0x1 << 16)
386 +#define EBU_CON_ALEC(cycles) ((cycles & 0x3) << 14)
387 +#define EBU_CON_BCGEN_CS (0x0 << 12)
388 +#define EBU_CON_BCGEN_INTEL (0x1 << 12)
389 +#define EBU_CON_BCGEN_MOTOROLA (0x2 << 12)
390 +#define EBU_CON_WAITWRC(cycles) ((cycles & 0x7) << 8)
391 +#define EBU_CON_WAITRDC(cycles) ((cycles & 0x3) << 6)
392 +#define EBU_CON_HOLDC(cycles) ((cycles & 0x3) << 4)
393 +#define EBU_CON_RECOVC(cycles) ((cycles & 0x3) << 2)
394 +#define EBU_CON_CMULT_1 0x0
395 +#define EBU_CON_CMULT_4 0x1
396 +#define EBU_CON_CMULT_8 0x2
397 +#define EBU_CON_CMULT_16 0x3
398 +
399 +#if defined(CONFIG_LTQ_SUPPORT_NOR_FLASH)
400 +#define ebu_region0_enable 1
401 +#else
402 +#define ebu_region0_enable 0
403 +#endif
404 +
405 +#if defined(CONFIG_LTQ_SUPPORT_NAND_FLASH)
406 +#define ebu_region1_enable 1
407 +#else
408 +#define ebu_region1_enable 0
409 +#endif
410 +
411 +struct ltq_ebu_regs {
412 + u32 clc;
413 + u32 rsvd0;
414 + u32 id;
415 + u32 rsvd1;
416 + u32 con;
417 + u32 rsvd2[3];
418 + u32 addr_sel_0;
419 + u32 addr_sel_1;
420 + u32 addr_sel_2;
421 + u32 addr_sel_3;
422 + u32 rsvd3[12];
423 + u32 con_0;
424 + u32 con_1;
425 + u32 con_2;
426 + u32 con_3;
427 +};
428 +
429 +static struct ltq_ebu_regs *ltq_ebu_regs =
430 + (struct ltq_ebu_regs *) CKSEG1ADDR(LTQ_EBU_BASE);
431 +
432 +void ltq_ebu_init(void)
433 +{
434 + if (ebu_region0_enable) {
435 + /*
436 + * Map EBU region 0 to range 0x10000000-0x13ffffff and enable
437 + * region control. This supports up to 32 MiB NOR flash in
438 + * bank 0.
439 + */
440 + ltq_writel(&ltq_ebu_regs->addr_sel_0, LTQ_EBU_REGION0_BASE |
441 + EBU_ADDRSEL_MASK(1) | EBU_ADDRSEL_REGEN);
442 +
443 + ltq_writel(&ltq_ebu_regs->con_0, EBU_CON_AGEN_DEMUX |
444 + EBU_CON_WAIT_DIS | EBU_CON_PW_16BIT |
445 + EBU_CON_ALEC(3) | EBU_CON_BCGEN_INTEL |
446 + EBU_CON_WAITWRC(7) | EBU_CON_WAITRDC(3) |
447 + EBU_CON_HOLDC(3) | EBU_CON_RECOVC(3) |
448 + EBU_CON_CMULT_16);
449 + } else
450 + ltq_clrbits(&ltq_ebu_regs->addr_sel_0, EBU_ADDRSEL_REGEN);
451 +
452 + if (ebu_region1_enable) {
453 + /*
454 + * Map EBU region 1 to range 0x14000000-0x13ffffff and enable
455 + * region control. This supports NAND flash in bank 1.
456 + */
457 + ltq_writel(&ltq_ebu_regs->addr_sel_1, LTQ_EBU_REGION1_BASE |
458 + EBU_ADDRSEL_MASK(3) | EBU_ADDRSEL_REGEN);
459 +
460 + ltq_writel(&ltq_ebu_regs->con_1, EBU_CON_AGEN_DEMUX |
461 + EBU_CON_SETUP | EBU_CON_WAIT_DIS | EBU_CON_PW_8BIT |
462 + EBU_CON_ALEC(3) | EBU_CON_BCGEN_INTEL |
463 + EBU_CON_WAITWRC(2) | EBU_CON_WAITRDC(2) |
464 + EBU_CON_HOLDC(1) | EBU_CON_RECOVC(1) |
465 + EBU_CON_CMULT_4);
466 + } else
467 + ltq_clrbits(&ltq_ebu_regs->addr_sel_1, EBU_ADDRSEL_REGEN);
468 +}
469 +
470 +void *flash_swap_addr(unsigned long addr)
471 +{
472 + return (void *)(addr ^ 2);
473 +}
474 --- /dev/null
475 +++ b/arch/mips/cpu/mips32/arx100/mem.c
476 @@ -0,0 +1,30 @@
477 +/*
478 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
479 + *
480 + * SPDX-License-Identifier: GPL-2.0+
481 + */
482 +
483 +#include <common.h>
484 +#include <asm/arch/soc.h>
485 +#include <asm/lantiq/io.h>
486 +
487 +static void *ltq_mc_ddr_base = (void *) CKSEG1ADDR(LTQ_MC_DDR_BASE);
488 +
489 +static inline u32 ltq_mc_dc_read(u32 index)
490 +{
491 + return ltq_readl(ltq_mc_ddr_base + LTQ_MC_DDR_DC_OFFSET(index));
492 +}
493 +
494 +phys_size_t initdram(int board_type)
495 +{
496 + u32 col, row, dc04, dc19, dc20;
497 +
498 + dc04 = ltq_mc_dc_read(4);
499 + dc19 = ltq_mc_dc_read(19);
500 + dc20 = ltq_mc_dc_read(20);
501 +
502 + row = (dc04 & 0xF) - ((dc19 & 0x700) >> 8);
503 + col = ((dc04 & 0xF00) >> 8) - (dc20 & 0x7);
504 +
505 + return (1 << (row + col)) * 4 * 2;
506 +}
507 --- /dev/null
508 +++ b/arch/mips/cpu/mips32/arx100/mem_init.S
509 @@ -0,0 +1,114 @@
510 +/*
511 + * Copyright (C) 2007-2010 Lantiq Deutschland GmbH
512 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
513 + *
514 + * SPDX-License-Identifier: GPL-2.0+
515 + */
516 +
517 +#include <config.h>
518 +#include <asm/asm.h>
519 +#include <asm/regdef.h>
520 +#include <asm/addrspace.h>
521 +#include <asm/arch/soc.h>
522 +
523 +/* Must be configured in BOARDDIR */
524 +#include <ddr_settings.h>
525 +
526 +#define LTQ_MC_GEN_ERRCAUSE 0x0010
527 +#define LTQ_MC_GEN_ERRADDR 0x0020
528 +#define LTQ_MC_GEN_CON 0x0060
529 +#define LTQ_MC_GEN_STAT 0x0070
530 +#define LTQ_MC_GEN_CON_SRAM_DDR_ENABLE 0xD
531 +#define LTQ_MC_GEN_STAT_DLCK_PWRON 0xC
532 +
533 +#define LTQ_MC_DDR_DC03_MC_START 0x100
534 +
535 + /* Store given value in MC DDR CCRx register */
536 + .macro dc_sw num, val
537 + li t2, \val
538 + sw t2, LTQ_MC_DDR_DC_OFFSET(\num)(t1)
539 + .endm
540 +
541 +LEAF(ltq_mem_init)
542 + /* Load MC General and MC DDR module base */
543 + li t0, (LTQ_MC_GEN_BASE | KSEG1)
544 + li t1, (LTQ_MC_DDR_BASE | KSEG1)
545 +
546 + /* Clear access error log registers */
547 + sw zero, LTQ_MC_GEN_ERRCAUSE(t0)
548 + sw zero, LTQ_MC_GEN_ERRADDR(t0)
549 +
550 + /* Enable DDR and SRAM module in memory controller */
551 + li t2, LTQ_MC_GEN_CON_SRAM_DDR_ENABLE
552 + sw t2, LTQ_MC_GEN_CON(t0)
553 +
554 + /* Clear start bit of DDR memory controller */
555 + sw zero, LTQ_MC_DDR_DC_OFFSET(3)(t1)
556 +
557 + /* Init memory controller registers with values ddr_settings.h */
558 + dc_sw 0, MC_DC00_VALUE
559 + dc_sw 1, MC_DC01_VALUE
560 + dc_sw 2, MC_DC02_VALUE
561 + dc_sw 4, MC_DC04_VALUE
562 + dc_sw 5, MC_DC05_VALUE
563 + dc_sw 6, MC_DC06_VALUE
564 + dc_sw 7, MC_DC07_VALUE
565 + dc_sw 8, MC_DC08_VALUE
566 + dc_sw 9, MC_DC09_VALUE
567 +
568 + dc_sw 10, MC_DC10_VALUE
569 + dc_sw 11, MC_DC11_VALUE
570 + dc_sw 12, MC_DC12_VALUE
571 + dc_sw 13, MC_DC13_VALUE
572 + dc_sw 14, MC_DC14_VALUE
573 + dc_sw 15, MC_DC15_VALUE
574 + dc_sw 16, MC_DC16_VALUE
575 + dc_sw 17, MC_DC17_VALUE
576 + dc_sw 18, MC_DC18_VALUE
577 + dc_sw 19, MC_DC19_VALUE
578 +
579 + dc_sw 20, MC_DC20_VALUE
580 + dc_sw 21, MC_DC21_VALUE
581 + dc_sw 22, MC_DC22_VALUE
582 + dc_sw 23, MC_DC23_VALUE
583 + dc_sw 24, MC_DC24_VALUE
584 + dc_sw 25, MC_DC25_VALUE
585 + dc_sw 26, MC_DC26_VALUE
586 + dc_sw 27, MC_DC27_VALUE
587 + dc_sw 28, MC_DC28_VALUE
588 + dc_sw 29, MC_DC29_VALUE
589 +
590 + dc_sw 30, MC_DC30_VALUE
591 + dc_sw 31, MC_DC31_VALUE
592 + dc_sw 32, MC_DC32_VALUE
593 + dc_sw 33, MC_DC33_VALUE
594 + dc_sw 34, MC_DC34_VALUE
595 + dc_sw 35, MC_DC35_VALUE
596 + dc_sw 36, MC_DC36_VALUE
597 + dc_sw 37, MC_DC37_VALUE
598 + dc_sw 38, MC_DC38_VALUE
599 + dc_sw 39, MC_DC39_VALUE
600 +
601 + dc_sw 40, MC_DC40_VALUE
602 + dc_sw 41, MC_DC41_VALUE
603 + dc_sw 42, MC_DC42_VALUE
604 + dc_sw 43, MC_DC43_VALUE
605 + dc_sw 44, MC_DC44_VALUE
606 + dc_sw 45, MC_DC45_VALUE
607 + dc_sw 46, MC_DC46_VALUE
608 +
609 + /* Set start bit of DDR memory controller */
610 + li t2, LTQ_MC_DDR_DC03_MC_START
611 + sw t2, LTQ_MC_DDR_DC_OFFSET(3)(t1)
612 +
613 + /* Wait until DLL has locked and core is ready for data transfers */
614 +wait_ready:
615 + lw t2, LTQ_MC_GEN_STAT(t0)
616 + li t3, LTQ_MC_GEN_STAT_DLCK_PWRON
617 + and t2, t3
618 + bne t2, t3, wait_ready
619 +
620 +finished:
621 + jr ra
622 +
623 + END(ltq_mem_init)
624 --- /dev/null
625 +++ b/arch/mips/cpu/mips32/arx100/pmu.c
626 @@ -0,0 +1,120 @@
627 +/*
628 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
629 + *
630 + * SPDX-License-Identifier: GPL-2.0+
631 + */
632 +
633 +#include <common.h>
634 +#include <asm/lantiq/io.h>
635 +#include <asm/lantiq/pm.h>
636 +#include <asm/arch/soc.h>
637 +
638 +#define LTQ_PMU_PWDCR_RESERVED 0xE00C200C
639 +
640 +#define LTQ_PMU_PWDCR_SWITCH (1 << 28)
641 +#define LTQ_PMU_PWDCR_USB1 (1 << 27)
642 +#define LTQ_PMU_PWDCR_USB1_PHY (1 << 26)
643 +#define LTQ_PMU_PWDCR_TDM (1 << 25)
644 +#define LTQ_PMU_PWDCR_DDR_MEM (1 << 24)
645 +#define LTQ_PMU_PWDCR_PPE_DP (1 << 23)
646 +#define LTQ_PMU_PWDCR_PPE_EMA (1 << 22)
647 +#define LTQ_PMU_PWDCR_PPE_TC (1 << 21)
648 +#define LTQ_PMU_PWDCR_DEU (1 << 20)
649 +#define LTQ_PMU_PWDCR_UART1 (1 << 17)
650 +#define LTQ_PMU_PWDCR_SDIO (1 << 16)
651 +#define LTQ_PMU_PWDCR_AHB (1 << 15)
652 +#define LTQ_PMU_PWDCR_FPI0 (1 << 14)
653 +#define LTQ_PMU_PWDCR_GPTC (1 << 12)
654 +#define LTQ_PMU_PWDCR_LEDC (1 << 11)
655 +#define LTQ_PMU_PWDCR_EBU (1 << 10)
656 +#define LTQ_PMU_PWDCR_DSL (1 << 9)
657 +#define LTQ_PMU_PWDCR_SPI (1 << 8)
658 +#define LTQ_PMU_PWDCR_UART0 (1 << 7)
659 +#define LTQ_PMU_PWDCR_USB (1 << 6)
660 +#define LTQ_PMU_PWDCR_DMA (1 << 5)
661 +#define LTQ_PMU_PWDCR_PCI (1 << 4)
662 +#define LTQ_PMU_PWDCR_FPI1 (1 << 1)
663 +#define LTQ_PMU_PWDCR_USB0_PHY (1 << 0)
664 +
665 +struct ltq_pmu_regs {
666 + u32 rsvd0[7];
667 + __be32 pwdcr;
668 + __be32 sr;
669 +};
670 +
671 +static struct ltq_pmu_regs *ltq_pmu_regs =
672 + (struct ltq_pmu_regs *) CKSEG1ADDR(LTQ_PMU_BASE);
673 +
674 +u32 ltq_pm_map(enum ltq_pm_modules module)
675 +{
676 + u32 val;
677 +
678 + switch (module) {
679 + case LTQ_PM_CORE:
680 + val = LTQ_PMU_PWDCR_DDR_MEM | LTQ_PMU_PWDCR_UART1 |
681 + LTQ_PMU_PWDCR_FPI0 | LTQ_PMU_PWDCR_LEDC |
682 + LTQ_PMU_PWDCR_EBU;
683 + break;
684 + case LTQ_PM_DMA:
685 + val = LTQ_PMU_PWDCR_DMA;
686 + break;
687 + case LTQ_PM_ETH:
688 + val = LTQ_PMU_PWDCR_SWITCH | LTQ_PMU_PWDCR_PPE_DP |
689 + LTQ_PMU_PWDCR_PPE_EMA | LTQ_PMU_PWDCR_PPE_TC;
690 + break;
691 + case LTQ_PM_SPI:
692 + val = LTQ_PMU_PWDCR_SPI;
693 + break;
694 + default:
695 + val = 0;
696 + break;
697 + }
698 +
699 + return val;
700 +}
701 +
702 +int ltq_pm_enable(enum ltq_pm_modules module)
703 +{
704 + const unsigned long timeout = 1000;
705 + unsigned long timebase;
706 + u32 sr, val;
707 +
708 + val = ltq_pm_map(module);
709 + if (unlikely(!val))
710 + return 1;
711 +
712 + ltq_clrbits(&ltq_pmu_regs->pwdcr, val);
713 +
714 + timebase = get_timer(0);
715 +
716 + do {
717 + sr = ltq_readl(&ltq_pmu_regs->sr);
718 + if (~sr & val)
719 + return 0;
720 + } while (get_timer(timebase) < timeout);
721 +
722 + return 1;
723 +}
724 +
725 +int ltq_pm_disable(enum ltq_pm_modules module)
726 +{
727 + u32 val;
728 +
729 + val = ltq_pm_map(module);
730 + if (unlikely(!val))
731 + return 1;
732 +
733 + ltq_setbits(&ltq_pmu_regs->pwdcr, val);
734 +
735 + return 0;
736 +}
737 +
738 +void ltq_pmu_init(void)
739 +{
740 + u32 set, clr;
741 +
742 + clr = ltq_pm_map(LTQ_PM_CORE);
743 + set = ~(LTQ_PMU_PWDCR_RESERVED | clr);
744 +
745 + ltq_clrsetbits(&ltq_pmu_regs->pwdcr, clr, set);
746 +}
747 --- /dev/null
748 +++ b/arch/mips/cpu/mips32/arx100/rcu.c
749 @@ -0,0 +1,130 @@
750 +/*
751 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
752 + *
753 + * SPDX-License-Identifier: GPL-2.0+
754 + */
755 +
756 +#include <common.h>
757 +#include <asm/lantiq/io.h>
758 +#include <asm/lantiq/reset.h>
759 +#include <asm/lantiq/cpu.h>
760 +#include <asm/arch/soc.h>
761 +
762 +#define LTQ_RCU_RD_SRST (1 << 30) /* Global SW Reset */
763 +#define LTQ_RCU_RD_USB1 (1 << 28) /* USB1 MAC and PHY */
764 +#define LTQ_RCU_RD_REG25_PD (1 << 26) /* Power down 2.5V regulator */
765 +#define LTQ_RCU_RD_PPE_ATM_TC (1 << 22) /* PPE ATM TC */
766 +#define LTQ_RCU_RD_ETHSW (1 << 21) /* Ethernet switch */
767 +#define LTQ_RCU_RD_DSP_DEN (1 << 20) /* Enable DSP JTAG */
768 +#define LTQ_RCU_RD_TDM (1 << 19) /* TDM module interface */
769 +#define LTQ_RCU_RD_MC (1 << 14) /* Memory Controller */
770 +#define LTQ_RCU_RD_PCI (1 << 13) /* PCI core */
771 +#define LTQ_RCU_RD_SDIO (1 << 10) /* SDIO core */
772 +#define LTQ_RCU_RD_DMA (1 << 9) /* DMA core */
773 +#define LTQ_RCU_RD_PPE (1 << 8) /* PPE core */
774 +#define LTQ_RCU_RD_ARC_DFE (1 << 7) /* ARC/DFE core */
775 +#define LTQ_RCU_RD_AHB (1 << 6) /* AHB bus */
776 +#define LTQ_RCU_RD_USB (1 << 4) /* USB and Phy core */
777 +#define LTQ_RCU_RD_FPI (1 << 2) /* FPI bus */
778 +#define LTQ_RCU_RD_CPU0 (1 << 1) /* CPU0 subsystem */
779 +#define LTQ_RCU_RD_HRST (1 << 0) /* HW reset via HRST pin */
780 +
781 +#define LTQ_RCU_STAT_BOOT_SHIFT 17
782 +#define LTQ_RCU_STAT_BOOT_MASK (0xf << LTQ_RCU_STAT_BOOT_SHIFT)
783 +
784 +struct ltq_rcu_regs {
785 + u32 rsvd0[4];
786 + __be32 req; /* Reset request */
787 + __be32 stat; /* Reset status */
788 + __be32 usb0_cfg; /* USB0 config */
789 + u32 rsvd1[2];
790 + __be32 pci_rdy; /* PCI boot ready */
791 + __be32 ppe_conf; /* PPE config */
792 + u32 rsvd2;
793 + __be32 usb1_cfg; /* USB1 config */
794 +};
795 +
796 +static struct ltq_rcu_regs *ltq_rcu_regs =
797 + (struct ltq_rcu_regs *) CKSEG1ADDR(LTQ_RCU_BASE);
798 +
799 +u32 ltq_reset_map(enum ltq_reset_modules module)
800 +{
801 + u32 val;
802 +
803 + switch (module) {
804 + case LTQ_RESET_CORE:
805 + case LTQ_RESET_SOFT:
806 + val = LTQ_RCU_RD_SRST | LTQ_RCU_RD_CPU0;
807 + break;
808 + case LTQ_RESET_DMA:
809 + val = LTQ_RCU_RD_DMA;
810 + break;
811 + case LTQ_RESET_ETH:
812 + val = LTQ_RCU_RD_PPE | LTQ_RCU_RD_ETHSW;
813 + break;
814 + case LTQ_RESET_HARD:
815 + val = LTQ_RCU_RD_HRST;
816 + break;
817 + default:
818 + val = 0;
819 + break;
820 + }
821 +
822 + return val;
823 +}
824 +
825 +int ltq_reset_activate(enum ltq_reset_modules module)
826 +{
827 + u32 val;
828 +
829 + val = ltq_reset_map(module);
830 + if (unlikely(!val))
831 + return 1;
832 +
833 + ltq_setbits(&ltq_rcu_regs->req, val);
834 +
835 + return 0;
836 +}
837 +
838 +int ltq_reset_deactivate(enum ltq_reset_modules module)
839 +{
840 + u32 val;
841 +
842 + val = ltq_reset_map(module);
843 + if (unlikely(!val))
844 + return 1;
845 +
846 + ltq_clrbits(&ltq_rcu_regs->req, val);
847 +
848 + return 0;
849 +}
850 +
851 +enum ltq_boot_select ltq_boot_select(void)
852 +{
853 + u32 stat;
854 + unsigned int bootstrap;
855 +
856 + stat = ltq_readl(&ltq_rcu_regs->stat);
857 + bootstrap = (stat & LTQ_RCU_STAT_BOOT_MASK) >> LTQ_RCU_STAT_BOOT_SHIFT;
858 +
859 + switch (bootstrap) {
860 + case 0:
861 + return BOOT_NOR_NO_BOOTROM;
862 + case 1:
863 + return BOOT_RGMII0;
864 + case 2:
865 + return BOOT_NOR;
866 + case 3:
867 + return BOOT_MII0;
868 + case 5:
869 + return BOOT_RMII0;
870 + case 6:
871 + return BOOT_PCI;
872 + case 8:
873 + return BOOT_UART;
874 + case 10:
875 + return BOOT_SPI;
876 + default:
877 + return BOOT_UNKNOWN;
878 + }
879 +}
880 --- a/arch/mips/cpu/mips32/lantiq-common/cpu.c
881 +++ b/arch/mips/cpu/mips32/lantiq-common/cpu.c
882 @@ -20,6 +20,7 @@ static const char ltq_bootsel_strings[][
883 "PCI",
884 "MII0",
885 "RMII0",
886 + "RGMII0",
887 "RGMII1",
888 "unknown",
889 };
890 --- a/arch/mips/cpu/mips32/lantiq-common/start.S
891 +++ b/arch/mips/cpu/mips32/lantiq-common/start.S
892 @@ -64,6 +64,11 @@
893 #define STATUS_LANTIQ (STATUS_MIPS24K | STATUS_MIPS32_64)
894 #endif
895
896 +#ifdef CONFIG_SOC_XWAY_ARX100
897 +#define CONFIG0_LANTIQ (CONFIG0_MIPS34K | CONFIG0_MIPS32_64)
898 +#define STATUS_LANTIQ (STATUS_MIPS34K | STATUS_MIPS32_64)
899 +#endif
900 +
901 #ifdef CONFIG_SOC_XWAY_VRX200
902 #define CONFIG0_LANTIQ (CONFIG0_MIPS34K | CONFIG0_MIPS32_64)
903 #define STATUS_LANTIQ (STATUS_MIPS34K | STATUS_MIPS32_64)
904 --- /dev/null
905 +++ b/arch/mips/include/asm/arch-arx100/config.h
906 @@ -0,0 +1,176 @@
907 +/*
908 + * Copyright (C) 2007-2010 Lantiq Deutschland GmbH
909 + * Copyright (C) 2011-2013 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
910 + *
911 + * SPDX-License-Identifier: GPL-2.0+
912 + *
913 + * Common board configuration for Lantiq XWAY ARX100 family
914 + *
915 + * Use following defines in your board config to enable specific features
916 + * and drivers for this SoC:
917 + *
918 + * CONFIG_LTQ_SUPPORT_UART
919 + * - support the Danube ASC/UART interface and console
920 + *
921 + * CONFIG_LTQ_SUPPORT_NOR_FLASH
922 + * - support a parallel NOR flash via the CFI interface in flash bank 0
923 + *
924 + * CONFIG_LTQ_SUPPORT_ETHERNET
925 + * - support the Danube ETOP and MAC interface
926 + *
927 + * CONFIG_LTQ_SUPPORT_SPI_FLASH
928 + * - support the Danube SPI interface and serial flash drivers
929 + * - specific SPI flash drivers must be configured separately
930 + */
931 +
932 +#ifndef __ARX100_CONFIG_H__
933 +#define __ARX100_CONFIG_H__
934 +
935 +/* CPU and SoC type */
936 +#define CONFIG_SOC_LANTIQ
937 +#define CONFIG_SOC_XWAY_ARX100
938 +
939 +/* Cache configuration */
940 +#define CONFIG_SYS_MIPS_CACHE_MODE CONF_CM_CACHABLE_NONCOHERENT
941 +#define CONFIG_SYS_DCACHE_SIZE (16 * 1024)
942 +#define CONFIG_SYS_ICACHE_SIZE (32 * 1024)
943 +#define CONFIG_SYS_CACHELINE_SIZE 32
944 +#define CONFIG_SYS_MIPS_CACHE_EXT_INIT
945 +
946 +/*
947 + * Supported clock modes
948 + * PLL0: rational PLL running at 500 MHz
949 + * PLL1: fractional PLL running at 393.219 MHz
950 + */
951 +#define LTQ_CLK_CPU_393_DDR_197 0
952 +#define LTQ_CLK_CPU_197_DDR_197 1
953 +#define LTQ_CLK_CPU_333_DDR_167 2
954 +#define LTQ_CLK_CPU_167_DDR_167 3
955 +#define LTQ_CLK_CPU_131_DDR_131 4
956 +#define LTQ_CLK_CPU_111_DDR_111 5
957 +
958 +/* CPU speed */
959 +#define CONFIG_SYS_CLOCK_MODE LTQ_CLK_CPU_333_DDR_167
960 +#define CONFIG_SYS_MIPS_TIMER_FREQ 166666667
961 +#define CONFIG_SYS_HZ 1000
962 +
963 +/* RAM */
964 +#define CONFIG_NR_DRAM_BANKS 1
965 +#define CONFIG_SYS_SDRAM_BASE 0x80000000
966 +#define CONFIG_SYS_SDRAM_BASE_UC 0xa0000000
967 +#define CONFIG_SYS_MEMTEST_START 0x81000000
968 +#define CONFIG_SYS_MEMTEST_END 0x82000000
969 +#define CONFIG_SYS_LOAD_ADDR 0x81000000
970 +#define CONFIG_SYS_LOAD_SIZE (2 * 1024 * 1024)
971 +#define CONFIG_SYS_INIT_SP_OFFSET (32 * 1024)
972 +
973 +/* SRAM */
974 +#define CONFIG_SYS_SRAM_BASE 0xBE1A0000
975 +#define CONFIG_SYS_SRAM_SIZE 0x10000
976 +
977 +/* ASC/UART driver and console */
978 +#define CONFIG_LANTIQ_SERIAL
979 +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
980 +
981 +/* GPIO */
982 +#define CONFIG_LANTIQ_GPIO
983 +#define CONFIG_LTQ_GPIO_MAX_BANKS 3
984 +#define CONFIG_LTQ_HAS_GPIO_BANK3
985 +
986 +/* FLASH driver */
987 +#if defined(CONFIG_LTQ_SUPPORT_NOR_FLASH)
988 +#define CONFIG_SYS_MAX_FLASH_BANKS 1
989 +#define CONFIG_SYS_MAX_FLASH_SECT 256
990 +#define CONFIG_SYS_FLASH_BASE 0xB0000000
991 +#define CONFIG_FLASH_16BIT
992 +#define CONFIG_SYS_FLASH_CFI
993 +#define CONFIG_FLASH_CFI_DRIVER
994 +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
995 +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
996 +#define CONFIG_FLASH_SHOW_PROGRESS 50
997 +#define CONFIG_SYS_FLASH_PROTECTION
998 +#define CONFIG_CFI_FLASH_USE_WEAK_ADDR_SWAP
999 +
1000 +#define CONFIG_CMD_FLASH
1001 +#else
1002 +#define CONFIG_SYS_NO_FLASH
1003 +#endif /* CONFIG_NOR_FLASH */
1004 +
1005 +#if defined(CONFIG_LTQ_SUPPORT_SPI_FLASH)
1006 +#define CONFIG_LANTIQ_SPI
1007 +#define CONFIG_SPI_FLASH
1008 +
1009 +#define CONFIG_CMD_SF
1010 +#define CONFIG_CMD_SPI
1011 +#endif
1012 +
1013 +#if defined(CONFIG_LTQ_SUPPORT_NAND_FLASH)
1014 +#define CONFIG_NAND_LANTIQ
1015 +#define CONFIG_SYS_MAX_NAND_DEVICE 1
1016 +#define CONFIG_SYS_NAND_BASE 0xB4000000
1017 +
1018 +#define CONFIG_CMD_NAND
1019 +#endif
1020 +
1021 +#if defined(CONFIG_LTQ_SUPPORT_ETHERNET)
1022 +#define CONFIG_LANTIQ_DMA
1023 +#define CONFIG_LANTIQ_ARX100_SWITCH
1024 +
1025 +#define CONFIG_PHYLIB
1026 +#define CONFIG_MII
1027 +#define CONFIG_UDP_CHECKSUM
1028 +
1029 +#define CONFIG_CMD_MII
1030 +#define CONFIG_CMD_NET
1031 +#endif
1032 +
1033 +#define CONFIG_SPL_MAX_SIZE (32 * 1024)
1034 +#define CONFIG_SPL_BSS_MAX_SIZE (8 * 1024)
1035 +#define CONFIG_SPL_STACK_MAX_SIZE (8 * 1024)
1036 +#define CONFIG_SPL_MALLOC_MAX_SIZE (32 * 1024)
1037 +#define CONFIG_SPL_STACK_BSS_IN_SRAM
1038 +
1039 +#if defined(CONFIG_SPL_STACK_BSS_IN_SRAM)
1040 +#define CONFIG_SPL_STACK_BASE (CONFIG_SYS_SRAM_BASE + \
1041 + CONFIG_SPL_MAX_SIZE + \
1042 + CONFIG_SPL_STACK_MAX_SIZE - 1)
1043 +#define CONFIG_SPL_BSS_BASE (CONFIG_SPL_STACK_BASE + 1)
1044 +#define CONFIG_SPL_MALLOC_BASE (CONFIG_SYS_SDRAM_BASE + \
1045 + CONFIG_SYS_INIT_SP_OFFSET)
1046 +#else
1047 +#define CONFIG_SPL_STACK_BASE (CONFIG_SYS_SDRAM_BASE + \
1048 + CONFIG_SYS_INIT_SP_OFFSET + \
1049 + CONFIG_SPL_STACK_MAX_SIZE - 1)
1050 +#define CONFIG_SPL_BSS_BASE (CONFIG_SPL_STACK_BASE + 1)
1051 +#define CONFIG_SPL_MALLOC_BASE (CONFIG_SPL_BSS_BASE + \
1052 + CONFIG_SPL_BSS_MAX_SIZE)
1053 +#endif
1054 +
1055 +#if defined(CONFIG_SYS_BOOT_RAM)
1056 +#define CONFIG_SYS_TEXT_BASE 0xA0100000
1057 +#define CONFIG_SKIP_LOWLEVEL_INIT
1058 +#define CONFIG_SYS_DISABLE_CACHE
1059 +#endif
1060 +
1061 +#if defined(CONFIG_SYS_BOOT_NOR)
1062 +#define CONFIG_SYS_TEXT_BASE 0xB0000000
1063 +#endif
1064 +
1065 +#if defined(CONFIG_SYS_BOOT_SFSPL) || defined(CONFIG_SYS_BOOT_NANDSPL)
1066 +#define CONFIG_SYS_TEXT_BASE 0x80100000
1067 +#define CONFIG_SPL_TEXT_BASE 0xBE1A0000
1068 +#endif
1069 +
1070 +#if defined(CONFIG_SYS_BOOT_NORSPL)
1071 +#define CONFIG_SYS_TEXT_BASE 0x80100000
1072 +#define CONFIG_SPL_TEXT_BASE 0xB0000000
1073 +#endif
1074 +
1075 +#if defined(CONFIG_SYS_BOOT_NOR) || defined(CONFIG_SYS_BOOT_NORSPL)
1076 +#define CONFIG_SYS_XWAY_EBU_BOOTCFG 0x688C688C
1077 +#define CONFIG_XWAY_SWAP_BYTES
1078 +#endif
1079 +
1080 +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
1081 +
1082 +#endif /* __ARX100_CONFIG_H__ */
1083 --- /dev/null
1084 +++ b/arch/mips/include/asm/arch-arx100/gpio.h
1085 @@ -0,0 +1,12 @@
1086 +/*
1087 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
1088 + *
1089 + * SPDX-License-Identifier: GPL-2.0+
1090 + */
1091 +
1092 +#ifndef __ARX100_GPIO_H__
1093 +#define __ARX100_GPIO_H__
1094 +
1095 +#include <asm/lantiq/gpio.h>
1096 +
1097 +#endif /* __ARX100_GPIO_H__ */
1098 --- /dev/null
1099 +++ b/arch/mips/include/asm/arch-arx100/nand.h
1100 @@ -0,0 +1,13 @@
1101 +/*
1102 + * Copyright (C) 2012-2013 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
1103 + *
1104 + * SPDX-License-Identifier: GPL-2.0+
1105 + */
1106 +
1107 +#ifndef __VRX200_NAND_H__
1108 +#define __VRX200_NAND_H__
1109 +
1110 +struct nand_chip;
1111 +int ltq_nand_init(struct nand_chip *nand);
1112 +
1113 +#endif /* __VRX200_NAND_H__ */
1114 --- /dev/null
1115 +++ b/arch/mips/include/asm/arch-arx100/soc.h
1116 @@ -0,0 +1,37 @@
1117 +/*
1118 + * Copyright (C) 2007-2010 Lantiq Deutschland GmbH
1119 + * Copyright (C) 2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
1120 + *
1121 + * SPDX-License-Identifier: GPL-2.0+
1122 + */
1123 +
1124 +#ifndef __ARX100_SOC_H__
1125 +#define __ARX100_SOC_H__
1126 +
1127 +#define LTQ_ASC0_BASE 0x1E100400
1128 +#define LTQ_SPI_BASE 0x1E100800
1129 +#define LTQ_GPIO_BASE 0x1E100B00
1130 +#define LTQ_SSIO_BASE 0x1E100BB0
1131 +#define LTQ_ASC1_BASE 0x1E100C00
1132 +#define LTQ_DMA_BASE 0x1E104100
1133 +
1134 +#define LTQ_EBU_BASE 0x1E105300
1135 +#define LTQ_EBU_REGION0_BASE 0x10000000
1136 +#define LTQ_EBU_REGION1_BASE 0x14000000
1137 +#define LTQ_EBU_NAND_BASE (LTQ_EBU_BASE + 0xB0)
1138 +
1139 +#define LTQ_PPE_BASE 0x1E180000
1140 +#define LTQ_SWITCH_BASE 0x1E108000
1141 +
1142 +#define LTQ_PMU_BASE 0x1F102000
1143 +#define LTQ_CGU_BASE 0x1F103000
1144 +#define LTQ_MPS_BASE 0x1F107000
1145 +#define LTQ_CHIPID_BASE (LTQ_MPS_BASE + 0x340)
1146 +#define LTQ_RCU_BASE 0x1F203000
1147 +
1148 +#define LTQ_MC_GEN_BASE 0x1F800000
1149 +#define LTQ_MC_SDR_BASE 0x1F800200
1150 +#define LTQ_MC_DDR_BASE 0x1F801000
1151 +#define LTQ_MC_DDR_DC_OFFSET(x) (x * 0x10)
1152 +
1153 +#endif /* __ARX100_SOC_H__ */
1154 --- a/arch/mips/include/asm/lantiq/chipid.h
1155 +++ b/arch/mips/include/asm/lantiq/chipid.h
1156 @@ -15,6 +15,10 @@ enum ltq_chip_partnum {
1157 LTQ_SOC_DANUBE = 0x0129,
1158 LTQ_SOC_DANUBE_S = 0x012B,
1159 LTQ_SOC_TWINPASS = 0x012D,
1160 + LTQ_SOC_ARX188 = 0x016C, /* ARX188 */
1161 + LTQ_SOC_ARX186 = 0x016D, /* ARX186 v1.1 */
1162 + LTQ_SOC_ARX186_2 = 0x016E, /* ARX186 v1.2 */
1163 + LTQ_SOC_ARX182 = 0x016F, /* ARX182 */
1164 LTQ_SOC_VRX288 = 0x01C0, /* VRX288 v1.1 */
1165 LTQ_SOC_VRX268 = 0x01C2, /* VRX268 v1.1 */
1166 LTQ_SOC_GRX288 = 0x01C9, /* GRX288 v1.1 */
1167 @@ -36,6 +40,38 @@ static inline int ltq_soc_is_danube(void
1168 {
1169 return 0;
1170 }
1171 +#endif
1172 +
1173 +#ifdef CONFIG_SOC_XWAY_ARX100
1174 +static inline int ltq_soc_is_arx100(void)
1175 +{
1176 + return 1;
1177 +}
1178 +
1179 +static inline int ltq_soc_is_arx100_v1(void)
1180 +{
1181 + return ltq_chip_version_get() == 1;
1182 +}
1183 +
1184 +static inline int ltq_soc_is_arx100_v2(void)
1185 +{
1186 + return ltq_chip_version_get() == 2;
1187 +}
1188 +#else
1189 +static inline int ltq_soc_is_arx100(void)
1190 +{
1191 + return 0;
1192 +}
1193 +
1194 +static inline int ltq_soc_is_arx100_v1(void)
1195 +{
1196 + return 0;
1197 +}
1198 +
1199 +static inline int ltq_soc_is_arx100_v2(void)
1200 +{
1201 + return 0;
1202 +}
1203 #endif
1204
1205 #ifdef CONFIG_SOC_XWAY_VRX200
1206 --- a/arch/mips/include/asm/lantiq/clk.h
1207 +++ b/arch/mips/include/asm/lantiq/clk.h
1208 @@ -13,9 +13,10 @@ enum ltq_clk {
1209 CLOCK_83_MHZ = 83333333,
1210 CLOCK_111_MHZ = 111111111,
1211 CLOCK_125_MHZ = 125000000,
1212 + CLOCK_131_MHZ = 131073000,
1213 CLOCK_133_MHZ = 133333333,
1214 CLOCK_166_MHZ = 166666667,
1215 - CLOCK_197_MHZ = 197000000,
1216 + CLOCK_197_MHZ = 196609500,
1217 CLOCK_333_MHZ = 333333333,
1218 CLOCK_393_MHZ = 393219000,
1219 CLOCK_500_MHZ = 500000000,
1220 --- a/arch/mips/include/asm/lantiq/cpu.h
1221 +++ b/arch/mips/include/asm/lantiq/cpu.h
1222 @@ -17,6 +17,7 @@ enum ltq_boot_select {
1223 BOOT_PCI,
1224 BOOT_MII0,
1225 BOOT_RMII0,
1226 + BOOT_RGMII0,
1227 BOOT_RGMII1,
1228 BOOT_UNKNOWN,
1229 };
Staging tree of dedeckeh