add ar7-2.6 fixes by Stefan Weil
[openwrt/svn-archive/archive.git] / target / linux / ar7-2.6 / patches / 100-board_support.patch
1 diff -Nru linux-2.6.19.2/arch/mips/Kconfig linux-ar7/arch/mips/Kconfig
2 --- linux-2.6.19.2/arch/mips/Kconfig 2006-12-12 02:32:53.000000000 +0700
3 +++ linux-ar7/arch/mips/Kconfig 2007-01-29 21:52:21.000000000 +0700
4 @@ -16,6 +16,20 @@
5 prompt "System type"
6 default SGI_IP22
7
8 +config AR7
9 + bool "Texas Instruments AR7"
10 + select BOOT_ELF32
11 + select DMA_NONCOHERENT
12 + select HW_HAS_PCI
13 + select IRQ_CPU
14 + select SWAP_IO_SPACE
15 + select SYS_HAS_CPU_MIPS32_R1
16 + select SYS_HAS_EARLY_PRINTK
17 + select SYS_SUPPORTS_32BIT_KERNEL
18 + select SYS_SUPPORTS_LITTLE_ENDIAN
19 + select NEED_MULTIPLE_NODES
20 + select GENERIC_GPIO
21 +
22 config MIPS_MTX1
23 bool "4G Systems MTX-1 board"
24 select DMA_NONCOHERENT
25 diff -Nru linux-2.6.19.2/arch/mips/Makefile linux-ar7/arch/mips/Makefile
26 --- linux-2.6.19.2/arch/mips/Makefile 2006-12-12 02:32:53.000000000 +0700
27 +++ linux-ar7/arch/mips/Makefile 2007-01-29 21:52:21.000000000 +0700
28 @@ -158,6 +158,13 @@
29 #
30
31 #
32 +# Texas Instruments AR7
33 +#
34 +core-$(CONFIG_AR7) += arch/mips/ar7/
35 +cflags-$(CONFIG_AR7) += -Iinclude/asm-mips/ar7
36 +load-$(CONFIG_AR7) += 0xffffffff94100000
37 +
38 +#
39 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
40 #
41 core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
42 diff -Nru linux-2.6.19.2/arch/mips/kernel/setup.c linux-ar7/arch/mips/kernel/setup.c
43 --- linux-2.6.19.2orig/arch/mips/kernel/setup.c 2006-12-12 02:32:53.000000000 +0700
44 +++ linux-ar7/arch/mips/kernel/setup.c 2007-03-04 22:32:13.000000000 +0700
45 @@ -236,7 +236,7 @@
46 * Initialize the bootmem allocator. It also setup initrd related data
47 * if needed.
48 */
49 -#ifdef CONFIG_SGI_IP27
50 +#ifdef CONFIG_NEED_MULTIPLE_NODES
51
52 static void __init bootmem_init(void)
53 {
54 @@ -244,7 +244,7 @@
55 finalize_initrd();
56 }
57
58 -#else /* !CONFIG_SGI_IP27 */
59 +#else /* !CONFIG_NEED_MULTIPLE_NODES */
60
61 static void __init bootmem_init(void)
62 {
63 @@ -349,7 +349,7 @@
64 finalize_initrd();
65 }
66
67 -#endif /* CONFIG_SGI_IP27 */
68 +#endif /* CONFIG_NEED_MULTIPLE_NODES */
69
70 /*
71 * arch_mem_init - initialize memory managment subsystem
72 diff -Nru linux-2.6.19.2/arch/mips/kernel/traps.c linux-ar7/arch/mips/kernel/traps.c
73 --- linux-2.6.19.2/arch/mips/kernel/traps.c 2007-01-11 02:10:37.000000000 +0700
74 +++ linux-ar7/arch/mips/kernel/traps.c 2007-03-15 13:19:19.000000000 +0700
75 @@ -1072,11 +1072,6 @@
76 unsigned long exception_handlers[32];
77 unsigned long vi_handlers[64];
78
79 -/*
80 - * As a side effect of the way this is implemented we're limited
81 - * to interrupt handlers in the address range from
82 - * KSEG0 <= x < KSEG0 + 256mb on the Nevada. Oh well ...
83 - */
84 void *set_except_vector(int n, void *addr)
85 {
86 unsigned long handler = (unsigned long) addr;
87 @@ -1084,9 +1079,15 @@
88
89 exception_handlers[n] = handler;
90 if (n == 0 && cpu_has_divec) {
91 - *(volatile u32 *)(ebase + 0x200) = 0x08000000 |
92 - (0x03ffffff & (handler >> 2));
93 - flush_icache_range(ebase + 0x200, ebase + 0x204);
94 + /* lui k0, 0x0000 */
95 + *(volatile u32 *)(CAC_BASE+0x200) = 0x3c1a0000 | (handler >> 16);
96 + /* ori k0, 0x0000 */
97 + *(volatile u32 *)(CAC_BASE+0x204) = 0x375a0000 | (handler & 0xffff);
98 + /* jr k0 */
99 + *(volatile u32 *)(CAC_BASE+0x208) = 0x03400008;
100 + /* nop */
101 + *(volatile u32 *)(CAC_BASE+0x20C) = 0x00000000;
102 + flush_icache_range(CAC_BASE+0x200, CAC_BASE+0x210);
103 }
104 return (void *)old_handler;
105 }