diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kconfig | 4 | ||||
-rw-r--r-- | arch/mips/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/arc/arc_con.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/irq-mv6434x.c | 8 | ||||
-rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 4 | ||||
-rw-r--r-- | arch/mips/mm/tlbex.c | 34 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/prom.c | 2 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/setup.c | 5 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_c/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_c/prom.c | 2 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_c/setup.c | 27 | ||||
-rw-r--r-- | arch/mips/pci/pci-ocelot-c.c | 6 |
12 files changed, 55 insertions, 42 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 767de847b4ab..3a0f89d2c8dc 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1053,6 +1053,7 @@ config CPU_MIPS32_R1 | |||
1053 | depends on SYS_HAS_CPU_MIPS32_R1 | 1053 | depends on SYS_HAS_CPU_MIPS32_R1 |
1054 | select CPU_HAS_PREFETCH | 1054 | select CPU_HAS_PREFETCH |
1055 | select CPU_SUPPORTS_32BIT_KERNEL | 1055 | select CPU_SUPPORTS_32BIT_KERNEL |
1056 | select CPU_SUPPORTS_HIGHMEM | ||
1056 | help | 1057 | help |
1057 | Choose this option to build a kernel for release 1 or later of the | 1058 | Choose this option to build a kernel for release 1 or later of the |
1058 | MIPS32 architecture. Most modern embedded systems with a 32-bit | 1059 | MIPS32 architecture. Most modern embedded systems with a 32-bit |
@@ -1069,6 +1070,7 @@ config CPU_MIPS32_R2 | |||
1069 | depends on SYS_HAS_CPU_MIPS32_R2 | 1070 | depends on SYS_HAS_CPU_MIPS32_R2 |
1070 | select CPU_HAS_PREFETCH | 1071 | select CPU_HAS_PREFETCH |
1071 | select CPU_SUPPORTS_32BIT_KERNEL | 1072 | select CPU_SUPPORTS_32BIT_KERNEL |
1073 | select CPU_SUPPORTS_HIGHMEM | ||
1072 | help | 1074 | help |
1073 | Choose this option to build a kernel for release 2 or later of the | 1075 | Choose this option to build a kernel for release 2 or later of the |
1074 | MIPS32 architecture. Most modern embedded systems with a 32-bit | 1076 | MIPS32 architecture. Most modern embedded systems with a 32-bit |
@@ -1082,6 +1084,7 @@ config CPU_MIPS64_R1 | |||
1082 | select CPU_HAS_PREFETCH | 1084 | select CPU_HAS_PREFETCH |
1083 | select CPU_SUPPORTS_32BIT_KERNEL | 1085 | select CPU_SUPPORTS_32BIT_KERNEL |
1084 | select CPU_SUPPORTS_64BIT_KERNEL | 1086 | select CPU_SUPPORTS_64BIT_KERNEL |
1087 | select CPU_SUPPORTS_HIGHMEM | ||
1085 | help | 1088 | help |
1086 | Choose this option to build a kernel for release 1 or later of the | 1089 | Choose this option to build a kernel for release 1 or later of the |
1087 | MIPS64 architecture. Many modern embedded systems with a 64-bit | 1090 | MIPS64 architecture. Many modern embedded systems with a 64-bit |
@@ -1099,6 +1102,7 @@ config CPU_MIPS64_R2 | |||
1099 | select CPU_HAS_PREFETCH | 1102 | select CPU_HAS_PREFETCH |
1100 | select CPU_SUPPORTS_32BIT_KERNEL | 1103 | select CPU_SUPPORTS_32BIT_KERNEL |
1101 | select CPU_SUPPORTS_64BIT_KERNEL | 1104 | select CPU_SUPPORTS_64BIT_KERNEL |
1105 | select CPU_SUPPORTS_HIGHMEM | ||
1102 | help | 1106 | help |
1103 | Choose this option to build a kernel for release 2 or later of the | 1107 | Choose this option to build a kernel for release 2 or later of the |
1104 | MIPS64 architecture. Many modern embedded systems with a 64-bit | 1108 | MIPS64 architecture. Many modern embedded systems with a 64-bit |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 38c0f3360d51..fe9da16f3a40 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -95,6 +95,7 @@ endif | |||
95 | # crossformat linking we rely on the elf2ecoff tool for format conversion. | 95 | # crossformat linking we rely on the elf2ecoff tool for format conversion. |
96 | # | 96 | # |
97 | cflags-y += -G 0 -mno-abicalls -fno-pic -pipe | 97 | cflags-y += -G 0 -mno-abicalls -fno-pic -pipe |
98 | cflags-y += -msoft-float | ||
98 | LDFLAGS_vmlinux += -G 0 -static -n -nostdlib | 99 | LDFLAGS_vmlinux += -G 0 -static -n -nostdlib |
99 | MODFLAGS += -mlong-calls | 100 | MODFLAGS += -mlong-calls |
100 | 101 | ||
diff --git a/arch/mips/arc/arc_con.c b/arch/mips/arc/arc_con.c index 51785a6a7328..bc32fe64f42a 100644 --- a/arch/mips/arc/arc_con.c +++ b/arch/mips/arc/arc_con.c | |||
@@ -24,7 +24,7 @@ static void prom_console_write(struct console *co, const char *s, | |||
24 | } | 24 | } |
25 | } | 25 | } |
26 | 26 | ||
27 | static int __init prom_console_setup(struct console *co, char *options) | 27 | static int prom_console_setup(struct console *co, char *options) |
28 | { | 28 | { |
29 | return !(prom_flags & PROM_FLAG_USE_AS_CONSOLE); | 29 | return !(prom_flags & PROM_FLAG_USE_AS_CONSOLE); |
30 | } | 30 | } |
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c index 0ac067f45cf5..0613f1f36b1b 100644 --- a/arch/mips/kernel/irq-mv6434x.c +++ b/arch/mips/kernel/irq-mv6434x.c | |||
@@ -11,12 +11,14 @@ | |||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <asm/ptrace.h> | ||
15 | #include <linux/sched.h> | ||
16 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
15 | #include <linux/mv643xx.h> | ||
16 | #include <linux/sched.h> | ||
17 | |||
18 | #include <asm/ptrace.h> | ||
17 | #include <asm/io.h> | 19 | #include <asm/io.h> |
18 | #include <asm/irq.h> | 20 | #include <asm/irq.h> |
19 | #include <linux/mv643xx.h> | 21 | #include <asm/marvell.h> |
20 | 22 | ||
21 | static unsigned int irq_base; | 23 | static unsigned int irq_base; |
22 | 24 | ||
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index ff699dbb99f7..2ad0cedf29fe 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
@@ -106,6 +106,9 @@ SECTIONS | |||
106 | .con_initcall.init : { *(.con_initcall.init) } | 106 | .con_initcall.init : { *(.con_initcall.init) } |
107 | __con_initcall_end = .; | 107 | __con_initcall_end = .; |
108 | SECURITY_INIT | 108 | SECURITY_INIT |
109 | /* .exit.text is discarded at runtime, not link time, to deal with | ||
110 | references from .rodata */ | ||
111 | .exit.text : { *(.exit.text) } | ||
109 | . = ALIGN(_PAGE_SIZE); | 112 | . = ALIGN(_PAGE_SIZE); |
110 | __initramfs_start = .; | 113 | __initramfs_start = .; |
111 | .init.ramfs : { *(.init.ramfs) } | 114 | .init.ramfs : { *(.init.ramfs) } |
@@ -133,7 +136,6 @@ SECTIONS | |||
133 | 136 | ||
134 | /* Sections to be discarded */ | 137 | /* Sections to be discarded */ |
135 | /DISCARD/ : { | 138 | /DISCARD/ : { |
136 | *(.exit.text) | ||
137 | *(.exit.data) | 139 | *(.exit.data) |
138 | *(.exitcall.exit) | 140 | *(.exitcall.exit) |
139 | 141 | ||
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 0f9485806bac..ac4f4bfaae50 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -280,69 +280,69 @@ static void __init build_insn(u32 **buf, enum opcode opc, ...) | |||
280 | } | 280 | } |
281 | 281 | ||
282 | #define I_u1u2u3(op) \ | 282 | #define I_u1u2u3(op) \ |
283 | static inline void i##op(u32 **buf, unsigned int a, \ | 283 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
284 | unsigned int b, unsigned int c) \ | 284 | unsigned int b, unsigned int c) \ |
285 | { \ | 285 | { \ |
286 | build_insn(buf, insn##op, a, b, c); \ | 286 | build_insn(buf, insn##op, a, b, c); \ |
287 | } | 287 | } |
288 | 288 | ||
289 | #define I_u2u1u3(op) \ | 289 | #define I_u2u1u3(op) \ |
290 | static inline void i##op(u32 **buf, unsigned int a, \ | 290 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
291 | unsigned int b, unsigned int c) \ | 291 | unsigned int b, unsigned int c) \ |
292 | { \ | 292 | { \ |
293 | build_insn(buf, insn##op, b, a, c); \ | 293 | build_insn(buf, insn##op, b, a, c); \ |
294 | } | 294 | } |
295 | 295 | ||
296 | #define I_u3u1u2(op) \ | 296 | #define I_u3u1u2(op) \ |
297 | static inline void i##op(u32 **buf, unsigned int a, \ | 297 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
298 | unsigned int b, unsigned int c) \ | 298 | unsigned int b, unsigned int c) \ |
299 | { \ | 299 | { \ |
300 | build_insn(buf, insn##op, b, c, a); \ | 300 | build_insn(buf, insn##op, b, c, a); \ |
301 | } | 301 | } |
302 | 302 | ||
303 | #define I_u1u2s3(op) \ | 303 | #define I_u1u2s3(op) \ |
304 | static inline void i##op(u32 **buf, unsigned int a, \ | 304 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
305 | unsigned int b, signed int c) \ | 305 | unsigned int b, signed int c) \ |
306 | { \ | 306 | { \ |
307 | build_insn(buf, insn##op, a, b, c); \ | 307 | build_insn(buf, insn##op, a, b, c); \ |
308 | } | 308 | } |
309 | 309 | ||
310 | #define I_u2s3u1(op) \ | 310 | #define I_u2s3u1(op) \ |
311 | static inline void i##op(u32 **buf, unsigned int a, \ | 311 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
312 | signed int b, unsigned int c) \ | 312 | signed int b, unsigned int c) \ |
313 | { \ | 313 | { \ |
314 | build_insn(buf, insn##op, c, a, b); \ | 314 | build_insn(buf, insn##op, c, a, b); \ |
315 | } | 315 | } |
316 | 316 | ||
317 | #define I_u2u1s3(op) \ | 317 | #define I_u2u1s3(op) \ |
318 | static inline void i##op(u32 **buf, unsigned int a, \ | 318 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
319 | unsigned int b, signed int c) \ | 319 | unsigned int b, signed int c) \ |
320 | { \ | 320 | { \ |
321 | build_insn(buf, insn##op, b, a, c); \ | 321 | build_insn(buf, insn##op, b, a, c); \ |
322 | } | 322 | } |
323 | 323 | ||
324 | #define I_u1u2(op) \ | 324 | #define I_u1u2(op) \ |
325 | static inline void i##op(u32 **buf, unsigned int a, \ | 325 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
326 | unsigned int b) \ | 326 | unsigned int b) \ |
327 | { \ | 327 | { \ |
328 | build_insn(buf, insn##op, a, b); \ | 328 | build_insn(buf, insn##op, a, b); \ |
329 | } | 329 | } |
330 | 330 | ||
331 | #define I_u1s2(op) \ | 331 | #define I_u1s2(op) \ |
332 | static inline void i##op(u32 **buf, unsigned int a, \ | 332 | static inline void __init i##op(u32 **buf, unsigned int a, \ |
333 | signed int b) \ | 333 | signed int b) \ |
334 | { \ | 334 | { \ |
335 | build_insn(buf, insn##op, a, b); \ | 335 | build_insn(buf, insn##op, a, b); \ |
336 | } | 336 | } |
337 | 337 | ||
338 | #define I_u1(op) \ | 338 | #define I_u1(op) \ |
339 | static inline void i##op(u32 **buf, unsigned int a) \ | 339 | static inline void __init i##op(u32 **buf, unsigned int a) \ |
340 | { \ | 340 | { \ |
341 | build_insn(buf, insn##op, a); \ | 341 | build_insn(buf, insn##op, a); \ |
342 | } | 342 | } |
343 | 343 | ||
344 | #define I_0(op) \ | 344 | #define I_0(op) \ |
345 | static inline void i##op(u32 **buf) \ | 345 | static inline void __init i##op(u32 **buf) \ |
346 | { \ | 346 | { \ |
347 | build_insn(buf, insn##op); \ | 347 | build_insn(buf, insn##op); \ |
348 | } | 348 | } |
@@ -623,42 +623,42 @@ static __init int __attribute__((unused)) insn_has_bdelay(struct reloc *rel, | |||
623 | } | 623 | } |
624 | 624 | ||
625 | /* convenience functions for labeled branches */ | 625 | /* convenience functions for labeled branches */ |
626 | static void __attribute__((unused)) il_bltz(u32 **p, struct reloc **r, | 626 | static void __init __attribute__((unused)) |
627 | unsigned int reg, enum label_id l) | 627 | il_bltz(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) |
628 | { | 628 | { |
629 | r_mips_pc16(r, *p, l); | 629 | r_mips_pc16(r, *p, l); |
630 | i_bltz(p, reg, 0); | 630 | i_bltz(p, reg, 0); |
631 | } | 631 | } |
632 | 632 | ||
633 | static void __attribute__((unused)) il_b(u32 **p, struct reloc **r, | 633 | static void __init __attribute__((unused)) il_b(u32 **p, struct reloc **r, |
634 | enum label_id l) | 634 | enum label_id l) |
635 | { | 635 | { |
636 | r_mips_pc16(r, *p, l); | 636 | r_mips_pc16(r, *p, l); |
637 | i_b(p, 0); | 637 | i_b(p, 0); |
638 | } | 638 | } |
639 | 639 | ||
640 | static void il_beqz(u32 **p, struct reloc **r, unsigned int reg, | 640 | static void __init il_beqz(u32 **p, struct reloc **r, unsigned int reg, |
641 | enum label_id l) | 641 | enum label_id l) |
642 | { | 642 | { |
643 | r_mips_pc16(r, *p, l); | 643 | r_mips_pc16(r, *p, l); |
644 | i_beqz(p, reg, 0); | 644 | i_beqz(p, reg, 0); |
645 | } | 645 | } |
646 | 646 | ||
647 | static void __attribute__((unused)) | 647 | static void __init __attribute__((unused)) |
648 | il_beqzl(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) | 648 | il_beqzl(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) |
649 | { | 649 | { |
650 | r_mips_pc16(r, *p, l); | 650 | r_mips_pc16(r, *p, l); |
651 | i_beqzl(p, reg, 0); | 651 | i_beqzl(p, reg, 0); |
652 | } | 652 | } |
653 | 653 | ||
654 | static void il_bnez(u32 **p, struct reloc **r, unsigned int reg, | 654 | static void __init il_bnez(u32 **p, struct reloc **r, unsigned int reg, |
655 | enum label_id l) | 655 | enum label_id l) |
656 | { | 656 | { |
657 | r_mips_pc16(r, *p, l); | 657 | r_mips_pc16(r, *p, l); |
658 | i_bnez(p, reg, 0); | 658 | i_bnez(p, reg, 0); |
659 | } | 659 | } |
660 | 660 | ||
661 | static void il_bgezl(u32 **p, struct reloc **r, unsigned int reg, | 661 | static void __init il_bgezl(u32 **p, struct reloc **r, unsigned int reg, |
662 | enum label_id l) | 662 | enum label_id l) |
663 | { | 663 | { |
664 | r_mips_pc16(r, *p, l); | 664 | r_mips_pc16(r, *p, l); |
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c index aae7a802767a..1cadaa92946a 100644 --- a/arch/mips/momentum/jaguar_atx/prom.c +++ b/arch/mips/momentum/jaguar_atx/prom.c | |||
@@ -21,10 +21,10 @@ | |||
21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <linux/bootmem.h> | 23 | #include <linux/bootmem.h> |
24 | #include <linux/mv643xx.h> | ||
24 | 25 | ||
25 | #include <asm/addrspace.h> | 26 | #include <asm/addrspace.h> |
26 | #include <asm/bootinfo.h> | 27 | #include <asm/bootinfo.h> |
27 | #include <asm/mv64340.h> | ||
28 | #include <asm/pmon.h> | 28 | #include <asm/pmon.h> |
29 | 29 | ||
30 | #include "jaguar_atx_fpga.h" | 30 | #include "jaguar_atx_fpga.h" |
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index 301d67226d72..2699917b640a 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * BRIEF MODULE DESCRIPTION | 2 | * BRIEF MODULE DESCRIPTION |
3 | * Momentum Computer Jaguar-ATX board dependent boot routines | 3 | * Momentum Computer Jaguar-ATX board dependent boot routines |
4 | * | 4 | * |
5 | * Copyright (C) 1996, 1997, 2001, 2004 Ralf Baechle (ralf@linux-mips.org) | 5 | * Copyright (C) 1996, 1997, 2001, 04, 06 Ralf Baechle (ralf@linux-mips.org) |
6 | * Copyright (C) 2000 RidgeRun, Inc. | 6 | * Copyright (C) 2000 RidgeRun, Inc. |
7 | * Copyright (C) 2001 Red Hat, Inc. | 7 | * Copyright (C) 2001 Red Hat, Inc. |
8 | * Copyright (C) 2002 Momentum Computer | 8 | * Copyright (C) 2002 Momentum Computer |
@@ -55,6 +55,8 @@ | |||
55 | #include <linux/interrupt.h> | 55 | #include <linux/interrupt.h> |
56 | #include <linux/timex.h> | 56 | #include <linux/timex.h> |
57 | #include <linux/vmalloc.h> | 57 | #include <linux/vmalloc.h> |
58 | #include <linux/mv643xx.h> | ||
59 | |||
58 | #include <asm/time.h> | 60 | #include <asm/time.h> |
59 | #include <asm/bootinfo.h> | 61 | #include <asm/bootinfo.h> |
60 | #include <asm/page.h> | 62 | #include <asm/page.h> |
@@ -64,7 +66,6 @@ | |||
64 | #include <asm/ptrace.h> | 66 | #include <asm/ptrace.h> |
65 | #include <asm/reboot.h> | 67 | #include <asm/reboot.h> |
66 | #include <asm/tlbflush.h> | 68 | #include <asm/tlbflush.h> |
67 | #include <asm/mv64340.h> | ||
68 | 69 | ||
69 | #include "jaguar_atx_fpga.h" | 70 | #include "jaguar_atx_fpga.h" |
70 | 71 | ||
diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c index 300fe8e4fbe8..a5764bc20e36 100644 --- a/arch/mips/momentum/ocelot_c/irq.c +++ b/arch/mips/momentum/ocelot_c/irq.c | |||
@@ -41,11 +41,11 @@ | |||
41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
42 | #include <linux/random.h> | 42 | #include <linux/random.h> |
43 | #include <linux/bitops.h> | 43 | #include <linux/bitops.h> |
44 | #include <linux/mv643xx.h> | ||
44 | #include <asm/bootinfo.h> | 45 | #include <asm/bootinfo.h> |
45 | #include <asm/io.h> | 46 | #include <asm/io.h> |
46 | #include <asm/irq_cpu.h> | 47 | #include <asm/irq_cpu.h> |
47 | #include <asm/mipsregs.h> | 48 | #include <asm/mipsregs.h> |
48 | #include <asm/mv64340.h> | ||
49 | #include <asm/system.h> | 49 | #include <asm/system.h> |
50 | 50 | ||
51 | extern asmlinkage void ocelot_handle_int(void); | 51 | extern asmlinkage void ocelot_handle_int(void); |
diff --git a/arch/mips/momentum/ocelot_c/prom.c b/arch/mips/momentum/ocelot_c/prom.c index 5b6809724b15..e92364482c7b 100644 --- a/arch/mips/momentum/ocelot_c/prom.c +++ b/arch/mips/momentum/ocelot_c/prom.c | |||
@@ -19,10 +19,10 @@ | |||
19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/bootmem.h> | 21 | #include <linux/bootmem.h> |
22 | #include <linux/mv643xx.h> | ||
22 | 23 | ||
23 | #include <asm/addrspace.h> | 24 | #include <asm/addrspace.h> |
24 | #include <asm/bootinfo.h> | 25 | #include <asm/bootinfo.h> |
25 | #include <asm/mv64340.h> | ||
26 | #include <asm/pmon.h> | 26 | #include <asm/pmon.h> |
27 | 27 | ||
28 | #include "ocelot_c_fpga.h" | 28 | #include "ocelot_c_fpga.h" |
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c index 15998d8a9341..bd02e60d037a 100644 --- a/arch/mips/momentum/ocelot_c/setup.c +++ b/arch/mips/momentum/ocelot_c/setup.c | |||
@@ -54,6 +54,7 @@ | |||
54 | #include <linux/pm.h> | 54 | #include <linux/pm.h> |
55 | #include <linux/timex.h> | 55 | #include <linux/timex.h> |
56 | #include <linux/vmalloc.h> | 56 | #include <linux/vmalloc.h> |
57 | #include <linux/mv643xx.h> | ||
57 | 58 | ||
58 | #include <asm/time.h> | 59 | #include <asm/time.h> |
59 | #include <asm/bootinfo.h> | 60 | #include <asm/bootinfo.h> |
@@ -64,9 +65,9 @@ | |||
64 | #include <asm/processor.h> | 65 | #include <asm/processor.h> |
65 | #include <asm/ptrace.h> | 66 | #include <asm/ptrace.h> |
66 | #include <asm/reboot.h> | 67 | #include <asm/reboot.h> |
68 | #include <asm/marvell.h> | ||
67 | #include <linux/bootmem.h> | 69 | #include <linux/bootmem.h> |
68 | #include <linux/blkdev.h> | 70 | #include <linux/blkdev.h> |
69 | #include <asm/mv64340.h> | ||
70 | #include "ocelot_c_fpga.h" | 71 | #include "ocelot_c_fpga.h" |
71 | 72 | ||
72 | unsigned long marvell_base; | 73 | unsigned long marvell_base; |
@@ -252,22 +253,22 @@ void __init plat_setup(void) | |||
252 | /* shut down ethernet ports, just to be sure our memory doesn't get | 253 | /* shut down ethernet ports, just to be sure our memory doesn't get |
253 | * corrupted by random ethernet traffic. | 254 | * corrupted by random ethernet traffic. |
254 | */ | 255 | */ |
255 | MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(0), 0xff << 8); | 256 | MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0), 0xff << 8); |
256 | MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(1), 0xff << 8); | 257 | MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1), 0xff << 8); |
257 | MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(0), 0xff << 8); | 258 | MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0), 0xff << 8); |
258 | MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(1), 0xff << 8); | 259 | MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1), 0xff << 8); |
259 | do {} | 260 | do {} |
260 | while (MV_READ(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(0)) & 0xff); | 261 | while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0)) & 0xff); |
261 | do {} | 262 | do {} |
262 | while (MV_READ(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(1)) & 0xff); | 263 | while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1)) & 0xff); |
263 | do {} | 264 | do {} |
264 | while (MV_READ(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(0)) & 0xff); | 265 | while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0)) & 0xff); |
265 | do {} | 266 | do {} |
266 | while (MV_READ(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(1)) & 0xff); | 267 | while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1)) & 0xff); |
267 | MV_WRITE(MV64340_ETH_PORT_SERIAL_CONTROL_REG(0), | 268 | MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0), |
268 | MV_READ(MV64340_ETH_PORT_SERIAL_CONTROL_REG(0)) & ~1); | 269 | MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0)) & ~1); |
269 | MV_WRITE(MV64340_ETH_PORT_SERIAL_CONTROL_REG(1), | 270 | MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1), |
270 | MV_READ(MV64340_ETH_PORT_SERIAL_CONTROL_REG(1)) & ~1); | 271 | MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1)) & ~1); |
271 | 272 | ||
272 | /* Turn off the Bit-Error LED */ | 273 | /* Turn off the Bit-Error LED */ |
273 | OCELOT_FPGA_WRITE(0x80, CLR); | 274 | OCELOT_FPGA_WRITE(0x80, CLR); |
diff --git a/arch/mips/pci/pci-ocelot-c.c b/arch/mips/pci/pci-ocelot-c.c index 1d84d36e034d..027759f7c904 100644 --- a/arch/mips/pci/pci-ocelot-c.c +++ b/arch/mips/pci/pci-ocelot-c.c | |||
@@ -3,15 +3,17 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 6 | * Copyright (C) 2004, 06 by Ralf Baechle (ralf@linux-mips.org) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/types.h> | 9 | #include <linux/types.h> |
10 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
11 | #include <asm/mv64340.h> | 11 | #include <linux/mv643xx.h> |
12 | 12 | ||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | 14 | ||
15 | #include <asm/marvell.h> | ||
16 | |||
15 | /* | 17 | /* |
16 | * We assume the address ranges have already been setup appropriately by | 18 | * We assume the address ranges have already been setup appropriately by |
17 | * the firmware. PMON in case of the Ocelot C does that. | 19 | * the firmware. PMON in case of the Ocelot C does that. |