diff options
-rw-r--r-- | arch/mips/Kconfig | 23 | ||||
-rw-r--r-- | arch/mips/Makefile | 11 | ||||
-rw-r--r-- | arch/mips/configs/jaguar-atx_defconfig | 897 | ||||
-rw-r--r-- | arch/mips/momentum/Kconfig | 6 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/Makefile | 12 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/dbg_io.c | 125 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/irq.c | 94 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/ja-console.c | 101 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h | 54 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/platform.c | 208 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/prom.c | 210 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/reset.c | 56 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/setup.c | 475 | ||||
-rw-r--r-- | arch/mips/pci/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/pci/fixup-jaguar.c | 43 | ||||
-rw-r--r-- | include/asm-mips/bootinfo.h | 2 | ||||
-rw-r--r-- | include/asm-mips/mach-ja/cpu-feature-overrides.h | 45 | ||||
-rw-r--r-- | include/asm-mips/mach-ja/spaces.h | 20 | ||||
-rw-r--r-- | include/asm-mips/serial.h | 19 |
19 files changed, 1 insertions, 2401 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ea3c53966dfd..515c5a698040 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -369,28 +369,6 @@ config MIPS_SIM | |||
369 | This option enables support for MIPS Technologies MIPSsim software | 369 | This option enables support for MIPS Technologies MIPSsim software |
370 | emulator. | 370 | emulator. |
371 | 371 | ||
372 | config MOMENCO_JAGUAR_ATX | ||
373 | bool "Momentum Jaguar board" | ||
374 | select BOOT_ELF32 | ||
375 | select DMA_NONCOHERENT | ||
376 | select HW_HAS_PCI | ||
377 | select IRQ_CPU | ||
378 | select IRQ_CPU_RM7K | ||
379 | select IRQ_MV64340 | ||
380 | select LIMITED_DMA | ||
381 | select PCI_MARVELL | ||
382 | select RM7000_CPU_SCACHE | ||
383 | select SWAP_IO_SPACE | ||
384 | select SYS_HAS_CPU_RM9000 | ||
385 | select SYS_HAS_EARLY_PRINTK | ||
386 | select SYS_SUPPORTS_32BIT_KERNEL | ||
387 | select SYS_SUPPORTS_64BIT_KERNEL | ||
388 | select SYS_SUPPORTS_BIG_ENDIAN | ||
389 | select SYS_SUPPORTS_KGDB | ||
390 | help | ||
391 | The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by | ||
392 | Momentum Computer <http://www.momenco.com/>. | ||
393 | |||
394 | config MOMENCO_OCELOT | 372 | config MOMENCO_OCELOT |
395 | bool "Momentum Ocelot board" | 373 | bool "Momentum Ocelot board" |
396 | select DMA_NONCOHERENT | 374 | select DMA_NONCOHERENT |
@@ -806,7 +784,6 @@ source "arch/mips/ddb5xxx/Kconfig" | |||
806 | source "arch/mips/gt64120/ev64120/Kconfig" | 784 | source "arch/mips/gt64120/ev64120/Kconfig" |
807 | source "arch/mips/jazz/Kconfig" | 785 | source "arch/mips/jazz/Kconfig" |
808 | source "arch/mips/lasat/Kconfig" | 786 | source "arch/mips/lasat/Kconfig" |
809 | source "arch/mips/momentum/Kconfig" | ||
810 | source "arch/mips/pmc-sierra/Kconfig" | 787 | source "arch/mips/pmc-sierra/Kconfig" |
811 | source "arch/mips/sgi-ip27/Kconfig" | 788 | source "arch/mips/sgi-ip27/Kconfig" |
812 | source "arch/mips/sibyte/Kconfig" | 789 | source "arch/mips/sibyte/Kconfig" |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 3c85c396504b..a68d462a415f 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -379,17 +379,6 @@ cflags-$(CONFIG_BASLER_EXCITE) += -Iinclude/asm-mips/mach-excite | |||
379 | load-$(CONFIG_BASLER_EXCITE) += 0x80100000 | 379 | load-$(CONFIG_BASLER_EXCITE) += 0x80100000 |
380 | 380 | ||
381 | # | 381 | # |
382 | # Momentum Jaguar ATX | ||
383 | # | ||
384 | core-$(CONFIG_MOMENCO_JAGUAR_ATX) += arch/mips/momentum/jaguar_atx/ | ||
385 | cflags-$(CONFIG_MOMENCO_JAGUAR_ATX) += -Iinclude/asm-mips/mach-ja | ||
386 | #ifdef CONFIG_JAGUAR_DMALOW | ||
387 | #load-$(CONFIG_MOMENCO_JAGUAR_ATX) += 0xffffffff88000000 | ||
388 | #else | ||
389 | load-$(CONFIG_MOMENCO_JAGUAR_ATX) += 0xffffffff80100000 | ||
390 | #endif | ||
391 | |||
392 | # | ||
393 | # NEC DDB | 382 | # NEC DDB |
394 | # | 383 | # |
395 | core-$(CONFIG_DDB5XXX_COMMON) += arch/mips/ddb5xxx/common/ | 384 | core-$(CONFIG_DDB5XXX_COMMON) += arch/mips/ddb5xxx/common/ |
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig deleted file mode 100644 index 083104daa2ca..000000000000 --- a/arch/mips/configs/jaguar-atx_defconfig +++ /dev/null | |||
@@ -1,897 +0,0 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.20 | ||
4 | # Tue Feb 20 21:47:33 2007 | ||
5 | # | ||
6 | CONFIG_MIPS=y | ||
7 | |||
8 | # | ||
9 | # Machine selection | ||
10 | # | ||
11 | CONFIG_ZONE_DMA=y | ||
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | ||
26 | # CONFIG_MIPS_COBALT is not set | ||
27 | # CONFIG_MACH_DECSTATION is not set | ||
28 | # CONFIG_MIPS_EV64120 is not set | ||
29 | # CONFIG_MACH_JAZZ is not set | ||
30 | # CONFIG_LASAT is not set | ||
31 | # CONFIG_MIPS_ATLAS is not set | ||
32 | # CONFIG_MIPS_MALTA is not set | ||
33 | # CONFIG_MIPS_SEAD is not set | ||
34 | # CONFIG_WR_PPMC is not set | ||
35 | # CONFIG_MIPS_SIM is not set | ||
36 | CONFIG_MOMENCO_JAGUAR_ATX=y | ||
37 | # CONFIG_MOMENCO_OCELOT is not set | ||
38 | # CONFIG_MOMENCO_OCELOT_3 is not set | ||
39 | # CONFIG_MOMENCO_OCELOT_C is not set | ||
40 | # CONFIG_MOMENCO_OCELOT_G is not set | ||
41 | # CONFIG_MIPS_XXS1500 is not set | ||
42 | # CONFIG_PNX8550_JBS is not set | ||
43 | # CONFIG_PNX8550_STB810 is not set | ||
44 | # CONFIG_DDB5477 is not set | ||
45 | # CONFIG_MACH_VR41XX is not set | ||
46 | # CONFIG_PMC_YOSEMITE is not set | ||
47 | # CONFIG_QEMU is not set | ||
48 | # CONFIG_MARKEINS is not set | ||
49 | # CONFIG_SGI_IP22 is not set | ||
50 | # CONFIG_SGI_IP27 is not set | ||
51 | # CONFIG_SGI_IP32 is not set | ||
52 | # CONFIG_SIBYTE_BIGSUR is not set | ||
53 | # CONFIG_SIBYTE_SWARM is not set | ||
54 | # CONFIG_SIBYTE_SENTOSA is not set | ||
55 | # CONFIG_SIBYTE_RHONE is not set | ||
56 | # CONFIG_SIBYTE_CARMEL is not set | ||
57 | # CONFIG_SIBYTE_PTSWARM is not set | ||
58 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
59 | # CONFIG_SIBYTE_CRHINE is not set | ||
60 | # CONFIG_SIBYTE_CRHONE is not set | ||
61 | # CONFIG_SNI_RM is not set | ||
62 | # CONFIG_TOSHIBA_JMR3927 is not set | ||
63 | # CONFIG_TOSHIBA_RBTX4927 is not set | ||
64 | # CONFIG_TOSHIBA_RBTX4938 is not set | ||
65 | CONFIG_JAGUAR_DMALOW=y | ||
66 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
67 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
68 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
69 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
70 | CONFIG_GENERIC_HWEIGHT=y | ||
71 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
72 | CONFIG_GENERIC_TIME=y | ||
73 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
74 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | ||
75 | CONFIG_DMA_NONCOHERENT=y | ||
76 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
77 | CONFIG_LIMITED_DMA=y | ||
78 | CONFIG_CPU_BIG_ENDIAN=y | ||
79 | # CONFIG_CPU_LITTLE_ENDIAN is not set | ||
80 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | ||
81 | CONFIG_IRQ_CPU=y | ||
82 | CONFIG_IRQ_CPU_RM7K=y | ||
83 | CONFIG_IRQ_MV64340=y | ||
84 | CONFIG_PCI_MARVELL=y | ||
85 | CONFIG_SWAP_IO_SPACE=y | ||
86 | CONFIG_BOOT_ELF32=y | ||
87 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | ||
88 | |||
89 | # | ||
90 | # CPU selection | ||
91 | # | ||
92 | # CONFIG_CPU_MIPS32_R1 is not set | ||
93 | # CONFIG_CPU_MIPS32_R2 is not set | ||
94 | # CONFIG_CPU_MIPS64_R1 is not set | ||
95 | # CONFIG_CPU_MIPS64_R2 is not set | ||
96 | # CONFIG_CPU_R3000 is not set | ||
97 | # CONFIG_CPU_TX39XX is not set | ||
98 | # CONFIG_CPU_VR41XX is not set | ||
99 | # CONFIG_CPU_R4300 is not set | ||
100 | # CONFIG_CPU_R4X00 is not set | ||
101 | # CONFIG_CPU_TX49XX is not set | ||
102 | # CONFIG_CPU_R5000 is not set | ||
103 | # CONFIG_CPU_R5432 is not set | ||
104 | # CONFIG_CPU_R6000 is not set | ||
105 | # CONFIG_CPU_NEVADA is not set | ||
106 | # CONFIG_CPU_R8000 is not set | ||
107 | # CONFIG_CPU_R10000 is not set | ||
108 | # CONFIG_CPU_RM7000 is not set | ||
109 | CONFIG_CPU_RM9000=y | ||
110 | # CONFIG_CPU_SB1 is not set | ||
111 | CONFIG_SYS_HAS_CPU_RM9000=y | ||
112 | CONFIG_WEAK_ORDERING=y | ||
113 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | ||
114 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
115 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | ||
116 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
117 | |||
118 | # | ||
119 | # Kernel type | ||
120 | # | ||
121 | CONFIG_32BIT=y | ||
122 | # CONFIG_64BIT is not set | ||
123 | CONFIG_PAGE_SIZE_4KB=y | ||
124 | # CONFIG_PAGE_SIZE_8KB is not set | ||
125 | # CONFIG_PAGE_SIZE_16KB is not set | ||
126 | # CONFIG_PAGE_SIZE_64KB is not set | ||
127 | CONFIG_BOARD_SCACHE=y | ||
128 | CONFIG_RM7000_CPU_SCACHE=y | ||
129 | CONFIG_CPU_HAS_PREFETCH=y | ||
130 | CONFIG_MIPS_MT_DISABLED=y | ||
131 | # CONFIG_MIPS_MT_SMP is not set | ||
132 | # CONFIG_MIPS_MT_SMTC is not set | ||
133 | # CONFIG_MIPS_VPE_LOADER is not set | ||
134 | # CONFIG_64BIT_PHYS_ADDR is not set | ||
135 | CONFIG_CPU_HAS_LLSC=y | ||
136 | CONFIG_CPU_HAS_SYNC=y | ||
137 | CONFIG_GENERIC_HARDIRQS=y | ||
138 | CONFIG_GENERIC_IRQ_PROBE=y | ||
139 | CONFIG_HIGHMEM=y | ||
140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
141 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | ||
142 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
143 | CONFIG_FLATMEM=y | ||
144 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
145 | # CONFIG_SPARSEMEM_STATIC is not set | ||
146 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
147 | # CONFIG_RESOURCES_64BIT is not set | ||
148 | CONFIG_ZONE_DMA_FLAG=1 | ||
149 | # CONFIG_HZ_48 is not set | ||
150 | # CONFIG_HZ_100 is not set | ||
151 | # CONFIG_HZ_128 is not set | ||
152 | # CONFIG_HZ_250 is not set | ||
153 | # CONFIG_HZ_256 is not set | ||
154 | CONFIG_HZ_1000=y | ||
155 | # CONFIG_HZ_1024 is not set | ||
156 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | ||
157 | CONFIG_HZ=1000 | ||
158 | CONFIG_PREEMPT_NONE=y | ||
159 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
160 | # CONFIG_PREEMPT is not set | ||
161 | CONFIG_LOCKDEP_SUPPORT=y | ||
162 | CONFIG_STACKTRACE_SUPPORT=y | ||
163 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
164 | |||
165 | # | ||
166 | # Code maturity level options | ||
167 | # | ||
168 | # CONFIG_EXPERIMENTAL is not set | ||
169 | CONFIG_BROKEN_ON_SMP=y | ||
170 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
171 | |||
172 | # | ||
173 | # General setup | ||
174 | # | ||
175 | CONFIG_LOCALVERSION="" | ||
176 | CONFIG_LOCALVERSION_AUTO=y | ||
177 | CONFIG_SWAP=y | ||
178 | CONFIG_SYSVIPC=y | ||
179 | # CONFIG_IPC_NS is not set | ||
180 | CONFIG_SYSVIPC_SYSCTL=y | ||
181 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
182 | # CONFIG_TASKSTATS is not set | ||
183 | # CONFIG_UTS_NS is not set | ||
184 | # CONFIG_AUDIT is not set | ||
185 | CONFIG_IKCONFIG=y | ||
186 | CONFIG_IKCONFIG_PROC=y | ||
187 | CONFIG_SYSFS_DEPRECATED=y | ||
188 | CONFIG_RELAY=y | ||
189 | CONFIG_SYSCTL=y | ||
190 | CONFIG_EMBEDDED=y | ||
191 | CONFIG_SYSCTL_SYSCALL=y | ||
192 | CONFIG_KALLSYMS=y | ||
193 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
194 | CONFIG_HOTPLUG=y | ||
195 | CONFIG_PRINTK=y | ||
196 | CONFIG_BUG=y | ||
197 | CONFIG_ELF_CORE=y | ||
198 | CONFIG_BASE_FULL=y | ||
199 | CONFIG_FUTEX=y | ||
200 | CONFIG_EPOLL=y | ||
201 | CONFIG_SHMEM=y | ||
202 | CONFIG_SLAB=y | ||
203 | CONFIG_VM_EVENT_COUNTERS=y | ||
204 | CONFIG_RT_MUTEXES=y | ||
205 | # CONFIG_TINY_SHMEM is not set | ||
206 | CONFIG_BASE_SMALL=0 | ||
207 | # CONFIG_SLOB is not set | ||
208 | |||
209 | # | ||
210 | # Loadable module support | ||
211 | # | ||
212 | CONFIG_MODULES=y | ||
213 | CONFIG_MODULE_UNLOAD=y | ||
214 | # CONFIG_MODVERSIONS is not set | ||
215 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
216 | CONFIG_KMOD=y | ||
217 | |||
218 | # | ||
219 | # Block layer | ||
220 | # | ||
221 | CONFIG_BLOCK=y | ||
222 | # CONFIG_LBD is not set | ||
223 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
224 | # CONFIG_LSF is not set | ||
225 | |||
226 | # | ||
227 | # IO Schedulers | ||
228 | # | ||
229 | CONFIG_IOSCHED_NOOP=y | ||
230 | CONFIG_IOSCHED_AS=y | ||
231 | CONFIG_IOSCHED_DEADLINE=y | ||
232 | CONFIG_IOSCHED_CFQ=y | ||
233 | CONFIG_DEFAULT_AS=y | ||
234 | # CONFIG_DEFAULT_DEADLINE is not set | ||
235 | # CONFIG_DEFAULT_CFQ is not set | ||
236 | # CONFIG_DEFAULT_NOOP is not set | ||
237 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
238 | |||
239 | # | ||
240 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | ||
241 | # | ||
242 | CONFIG_HW_HAS_PCI=y | ||
243 | CONFIG_PCI=y | ||
244 | CONFIG_MMU=y | ||
245 | |||
246 | # | ||
247 | # PCCARD (PCMCIA/CardBus) support | ||
248 | # | ||
249 | # CONFIG_PCCARD is not set | ||
250 | |||
251 | # | ||
252 | # PCI Hotplug Support | ||
253 | # | ||
254 | |||
255 | # | ||
256 | # Executable file formats | ||
257 | # | ||
258 | CONFIG_BINFMT_ELF=y | ||
259 | # CONFIG_BINFMT_MISC is not set | ||
260 | CONFIG_TRAD_SIGNALS=y | ||
261 | |||
262 | # | ||
263 | # Power management options | ||
264 | # | ||
265 | CONFIG_PM=y | ||
266 | # CONFIG_PM_LEGACY is not set | ||
267 | # CONFIG_PM_DEBUG is not set | ||
268 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
269 | |||
270 | # | ||
271 | # Networking | ||
272 | # | ||
273 | CONFIG_NET=y | ||
274 | |||
275 | # | ||
276 | # Networking options | ||
277 | # | ||
278 | # CONFIG_NETDEBUG is not set | ||
279 | # CONFIG_PACKET is not set | ||
280 | CONFIG_UNIX=y | ||
281 | CONFIG_XFRM=y | ||
282 | CONFIG_XFRM_USER=m | ||
283 | # CONFIG_NET_KEY is not set | ||
284 | CONFIG_INET=y | ||
285 | # CONFIG_IP_MULTICAST is not set | ||
286 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
287 | CONFIG_IP_FIB_HASH=y | ||
288 | CONFIG_IP_PNP=y | ||
289 | # CONFIG_IP_PNP_DHCP is not set | ||
290 | CONFIG_IP_PNP_BOOTP=y | ||
291 | # CONFIG_IP_PNP_RARP is not set | ||
292 | # CONFIG_NET_IPIP is not set | ||
293 | # CONFIG_NET_IPGRE is not set | ||
294 | # CONFIG_SYN_COOKIES is not set | ||
295 | # CONFIG_INET_AH is not set | ||
296 | # CONFIG_INET_ESP is not set | ||
297 | # CONFIG_INET_IPCOMP is not set | ||
298 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
299 | CONFIG_INET_TUNNEL=m | ||
300 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | ||
301 | CONFIG_INET_XFRM_MODE_TUNNEL=m | ||
302 | CONFIG_INET_XFRM_MODE_BEET=m | ||
303 | CONFIG_INET_DIAG=y | ||
304 | CONFIG_INET_TCP_DIAG=y | ||
305 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
306 | CONFIG_TCP_CONG_CUBIC=y | ||
307 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
308 | CONFIG_IPV6=m | ||
309 | CONFIG_IPV6_PRIVACY=y | ||
310 | CONFIG_IPV6_ROUTER_PREF=y | ||
311 | CONFIG_INET6_AH=m | ||
312 | CONFIG_INET6_ESP=m | ||
313 | CONFIG_INET6_IPCOMP=m | ||
314 | CONFIG_INET6_XFRM_TUNNEL=m | ||
315 | CONFIG_INET6_TUNNEL=m | ||
316 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
317 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
318 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
319 | CONFIG_IPV6_SIT=m | ||
320 | CONFIG_IPV6_TUNNEL=m | ||
321 | CONFIG_NETWORK_SECMARK=y | ||
322 | # CONFIG_NETFILTER is not set | ||
323 | # CONFIG_BRIDGE is not set | ||
324 | # CONFIG_VLAN_8021Q is not set | ||
325 | # CONFIG_DECNET is not set | ||
326 | # CONFIG_LLC2 is not set | ||
327 | # CONFIG_IPX is not set | ||
328 | # CONFIG_ATALK is not set | ||
329 | |||
330 | # | ||
331 | # QoS and/or fair queueing | ||
332 | # | ||
333 | # CONFIG_NET_SCHED is not set | ||
334 | |||
335 | # | ||
336 | # Network testing | ||
337 | # | ||
338 | # CONFIG_NET_PKTGEN is not set | ||
339 | # CONFIG_HAMRADIO is not set | ||
340 | # CONFIG_IRDA is not set | ||
341 | # CONFIG_BT is not set | ||
342 | CONFIG_IEEE80211=m | ||
343 | # CONFIG_IEEE80211_DEBUG is not set | ||
344 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
345 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
346 | |||
347 | # | ||
348 | # Device Drivers | ||
349 | # | ||
350 | |||
351 | # | ||
352 | # Generic Driver Options | ||
353 | # | ||
354 | CONFIG_STANDALONE=y | ||
355 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
356 | CONFIG_FW_LOADER=m | ||
357 | # CONFIG_SYS_HYPERVISOR is not set | ||
358 | |||
359 | # | ||
360 | # Connector - unified userspace <-> kernelspace linker | ||
361 | # | ||
362 | CONFIG_CONNECTOR=m | ||
363 | |||
364 | # | ||
365 | # Memory Technology Devices (MTD) | ||
366 | # | ||
367 | # CONFIG_MTD is not set | ||
368 | |||
369 | # | ||
370 | # Parallel port support | ||
371 | # | ||
372 | # CONFIG_PARPORT is not set | ||
373 | |||
374 | # | ||
375 | # Plug and Play support | ||
376 | # | ||
377 | # CONFIG_PNPACPI is not set | ||
378 | |||
379 | # | ||
380 | # Block devices | ||
381 | # | ||
382 | # CONFIG_BLK_CPQ_DA is not set | ||
383 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
384 | # CONFIG_BLK_DEV_DAC960 is not set | ||
385 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
386 | # CONFIG_BLK_DEV_LOOP is not set | ||
387 | # CONFIG_BLK_DEV_NBD is not set | ||
388 | # CONFIG_BLK_DEV_SX8 is not set | ||
389 | # CONFIG_BLK_DEV_RAM is not set | ||
390 | # CONFIG_BLK_DEV_INITRD is not set | ||
391 | CONFIG_CDROM_PKTCDVD=m | ||
392 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | ||
393 | CONFIG_ATA_OVER_ETH=m | ||
394 | |||
395 | # | ||
396 | # Misc devices | ||
397 | # | ||
398 | CONFIG_SGI_IOC4=m | ||
399 | |||
400 | # | ||
401 | # ATA/ATAPI/MFM/RLL support | ||
402 | # | ||
403 | # CONFIG_IDE is not set | ||
404 | |||
405 | # | ||
406 | # SCSI device support | ||
407 | # | ||
408 | CONFIG_RAID_ATTRS=m | ||
409 | # CONFIG_SCSI is not set | ||
410 | # CONFIG_SCSI_NETLINK is not set | ||
411 | |||
412 | # | ||
413 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
414 | # | ||
415 | # CONFIG_ATA is not set | ||
416 | |||
417 | # | ||
418 | # Multi-device support (RAID and LVM) | ||
419 | # | ||
420 | # CONFIG_MD is not set | ||
421 | |||
422 | # | ||
423 | # Fusion MPT device support | ||
424 | # | ||
425 | # CONFIG_FUSION is not set | ||
426 | |||
427 | # | ||
428 | # IEEE 1394 (FireWire) support | ||
429 | # | ||
430 | # CONFIG_IEEE1394 is not set | ||
431 | |||
432 | # | ||
433 | # I2O device support | ||
434 | # | ||
435 | # CONFIG_I2O is not set | ||
436 | |||
437 | # | ||
438 | # Network device support | ||
439 | # | ||
440 | CONFIG_NETDEVICES=y | ||
441 | # CONFIG_DUMMY is not set | ||
442 | # CONFIG_BONDING is not set | ||
443 | # CONFIG_EQUALIZER is not set | ||
444 | # CONFIG_TUN is not set | ||
445 | |||
446 | # | ||
447 | # ARCnet devices | ||
448 | # | ||
449 | # CONFIG_ARCNET is not set | ||
450 | |||
451 | # | ||
452 | # PHY device support | ||
453 | # | ||
454 | CONFIG_PHYLIB=m | ||
455 | |||
456 | # | ||
457 | # MII PHY device drivers | ||
458 | # | ||
459 | CONFIG_MARVELL_PHY=m | ||
460 | CONFIG_DAVICOM_PHY=m | ||
461 | CONFIG_QSEMI_PHY=m | ||
462 | CONFIG_LXT_PHY=m | ||
463 | CONFIG_CICADA_PHY=m | ||
464 | CONFIG_VITESSE_PHY=m | ||
465 | CONFIG_SMSC_PHY=m | ||
466 | # CONFIG_BROADCOM_PHY is not set | ||
467 | # CONFIG_FIXED_PHY is not set | ||
468 | |||
469 | # | ||
470 | # Ethernet (10 or 100Mbit) | ||
471 | # | ||
472 | CONFIG_NET_ETHERNET=y | ||
473 | CONFIG_MII=y | ||
474 | # CONFIG_HAPPYMEAL is not set | ||
475 | # CONFIG_SUNGEM is not set | ||
476 | # CONFIG_CASSINI is not set | ||
477 | # CONFIG_NET_VENDOR_3COM is not set | ||
478 | # CONFIG_DM9000 is not set | ||
479 | |||
480 | # | ||
481 | # Tulip family network device support | ||
482 | # | ||
483 | # CONFIG_NET_TULIP is not set | ||
484 | # CONFIG_HP100 is not set | ||
485 | CONFIG_NET_PCI=y | ||
486 | # CONFIG_PCNET32 is not set | ||
487 | # CONFIG_AMD8111_ETH is not set | ||
488 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
489 | # CONFIG_B44 is not set | ||
490 | # CONFIG_FORCEDETH is not set | ||
491 | # CONFIG_DGRS is not set | ||
492 | CONFIG_EEPRO100=y | ||
493 | # CONFIG_E100 is not set | ||
494 | # CONFIG_FEALNX is not set | ||
495 | # CONFIG_NATSEMI is not set | ||
496 | # CONFIG_NE2K_PCI is not set | ||
497 | # CONFIG_8139TOO is not set | ||
498 | # CONFIG_SIS900 is not set | ||
499 | # CONFIG_EPIC100 is not set | ||
500 | # CONFIG_SUNDANCE is not set | ||
501 | # CONFIG_TLAN is not set | ||
502 | # CONFIG_VIA_RHINE is not set | ||
503 | |||
504 | # | ||
505 | # Ethernet (1000 Mbit) | ||
506 | # | ||
507 | # CONFIG_ACENIC is not set | ||
508 | # CONFIG_DL2K is not set | ||
509 | # CONFIG_E1000 is not set | ||
510 | # CONFIG_NS83820 is not set | ||
511 | # CONFIG_HAMACHI is not set | ||
512 | # CONFIG_R8169 is not set | ||
513 | # CONFIG_SIS190 is not set | ||
514 | # CONFIG_SKGE is not set | ||
515 | # CONFIG_SKY2 is not set | ||
516 | # CONFIG_SK98LIN is not set | ||
517 | # CONFIG_VIA_VELOCITY is not set | ||
518 | # CONFIG_TIGON3 is not set | ||
519 | # CONFIG_BNX2 is not set | ||
520 | CONFIG_MV643XX_ETH=y | ||
521 | CONFIG_QLA3XXX=m | ||
522 | |||
523 | # | ||
524 | # Ethernet (10000 Mbit) | ||
525 | # | ||
526 | # CONFIG_CHELSIO_T1 is not set | ||
527 | CONFIG_CHELSIO_T3=m | ||
528 | # CONFIG_IXGB is not set | ||
529 | # CONFIG_S2IO is not set | ||
530 | # CONFIG_MYRI10GE is not set | ||
531 | CONFIG_NETXEN_NIC=m | ||
532 | |||
533 | # | ||
534 | # Token Ring devices | ||
535 | # | ||
536 | # CONFIG_TR is not set | ||
537 | |||
538 | # | ||
539 | # Wireless LAN (non-hamradio) | ||
540 | # | ||
541 | # CONFIG_NET_RADIO is not set | ||
542 | |||
543 | # | ||
544 | # Wan interfaces | ||
545 | # | ||
546 | # CONFIG_WAN is not set | ||
547 | # CONFIG_FDDI is not set | ||
548 | # CONFIG_PPP is not set | ||
549 | # CONFIG_SLIP is not set | ||
550 | # CONFIG_NETPOLL is not set | ||
551 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
552 | |||
553 | # | ||
554 | # ISDN subsystem | ||
555 | # | ||
556 | # CONFIG_ISDN is not set | ||
557 | |||
558 | # | ||
559 | # Telephony Support | ||
560 | # | ||
561 | # CONFIG_PHONE is not set | ||
562 | |||
563 | # | ||
564 | # Input device support | ||
565 | # | ||
566 | # CONFIG_INPUT is not set | ||
567 | |||
568 | # | ||
569 | # Hardware I/O ports | ||
570 | # | ||
571 | # CONFIG_SERIO is not set | ||
572 | # CONFIG_GAMEPORT is not set | ||
573 | |||
574 | # | ||
575 | # Character devices | ||
576 | # | ||
577 | # CONFIG_VT is not set | ||
578 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
579 | |||
580 | # | ||
581 | # Serial drivers | ||
582 | # | ||
583 | CONFIG_SERIAL_8250=y | ||
584 | CONFIG_SERIAL_8250_CONSOLE=y | ||
585 | CONFIG_SERIAL_8250_PCI=y | ||
586 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
587 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
588 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
589 | |||
590 | # | ||
591 | # Non-8250 serial port support | ||
592 | # | ||
593 | CONFIG_SERIAL_CORE=y | ||
594 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
595 | # CONFIG_SERIAL_JSM is not set | ||
596 | CONFIG_UNIX98_PTYS=y | ||
597 | CONFIG_LEGACY_PTYS=y | ||
598 | CONFIG_LEGACY_PTY_COUNT=256 | ||
599 | |||
600 | # | ||
601 | # IPMI | ||
602 | # | ||
603 | # CONFIG_IPMI_HANDLER is not set | ||
604 | |||
605 | # | ||
606 | # Watchdog Cards | ||
607 | # | ||
608 | # CONFIG_WATCHDOG is not set | ||
609 | # CONFIG_HW_RANDOM is not set | ||
610 | # CONFIG_RTC is not set | ||
611 | # CONFIG_GEN_RTC is not set | ||
612 | # CONFIG_DTLK is not set | ||
613 | # CONFIG_R3964 is not set | ||
614 | # CONFIG_APPLICOM is not set | ||
615 | # CONFIG_DRM is not set | ||
616 | # CONFIG_RAW_DRIVER is not set | ||
617 | |||
618 | # | ||
619 | # TPM devices | ||
620 | # | ||
621 | |||
622 | # | ||
623 | # I2C support | ||
624 | # | ||
625 | # CONFIG_I2C is not set | ||
626 | |||
627 | # | ||
628 | # SPI support | ||
629 | # | ||
630 | # CONFIG_SPI is not set | ||
631 | # CONFIG_SPI_MASTER is not set | ||
632 | |||
633 | # | ||
634 | # Dallas's 1-wire bus | ||
635 | # | ||
636 | # CONFIG_W1 is not set | ||
637 | |||
638 | # | ||
639 | # Hardware Monitoring support | ||
640 | # | ||
641 | # CONFIG_HWMON is not set | ||
642 | # CONFIG_HWMON_VID is not set | ||
643 | |||
644 | # | ||
645 | # Multimedia devices | ||
646 | # | ||
647 | # CONFIG_VIDEO_DEV is not set | ||
648 | |||
649 | # | ||
650 | # Digital Video Broadcasting Devices | ||
651 | # | ||
652 | # CONFIG_DVB is not set | ||
653 | |||
654 | # | ||
655 | # Graphics support | ||
656 | # | ||
657 | # CONFIG_FIRMWARE_EDID is not set | ||
658 | # CONFIG_FB is not set | ||
659 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
660 | |||
661 | # | ||
662 | # Sound | ||
663 | # | ||
664 | # CONFIG_SOUND is not set | ||
665 | |||
666 | # | ||
667 | # USB support | ||
668 | # | ||
669 | CONFIG_USB_ARCH_HAS_HCD=y | ||
670 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
671 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
672 | # CONFIG_USB is not set | ||
673 | |||
674 | # | ||
675 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
676 | # | ||
677 | |||
678 | # | ||
679 | # USB Gadget Support | ||
680 | # | ||
681 | # CONFIG_USB_GADGET is not set | ||
682 | |||
683 | # | ||
684 | # MMC/SD Card support | ||
685 | # | ||
686 | # CONFIG_MMC is not set | ||
687 | |||
688 | # | ||
689 | # LED devices | ||
690 | # | ||
691 | # CONFIG_NEW_LEDS is not set | ||
692 | |||
693 | # | ||
694 | # LED drivers | ||
695 | # | ||
696 | |||
697 | # | ||
698 | # LED Triggers | ||
699 | # | ||
700 | |||
701 | # | ||
702 | # InfiniBand support | ||
703 | # | ||
704 | # CONFIG_INFINIBAND is not set | ||
705 | |||
706 | # | ||
707 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
708 | # | ||
709 | |||
710 | # | ||
711 | # Real Time Clock | ||
712 | # | ||
713 | |||
714 | # | ||
715 | # DMA Engine support | ||
716 | # | ||
717 | # CONFIG_DMA_ENGINE is not set | ||
718 | |||
719 | # | ||
720 | # DMA Clients | ||
721 | # | ||
722 | |||
723 | # | ||
724 | # DMA Devices | ||
725 | # | ||
726 | |||
727 | # | ||
728 | # Auxiliary Display support | ||
729 | # | ||
730 | |||
731 | # | ||
732 | # Virtualization | ||
733 | # | ||
734 | |||
735 | # | ||
736 | # File systems | ||
737 | # | ||
738 | # CONFIG_EXT2_FS is not set | ||
739 | # CONFIG_EXT3_FS is not set | ||
740 | # CONFIG_REISERFS_FS is not set | ||
741 | # CONFIG_JFS_FS is not set | ||
742 | CONFIG_FS_POSIX_ACL=y | ||
743 | # CONFIG_XFS_FS is not set | ||
744 | # CONFIG_OCFS2_FS is not set | ||
745 | # CONFIG_MINIX_FS is not set | ||
746 | # CONFIG_ROMFS_FS is not set | ||
747 | CONFIG_INOTIFY=y | ||
748 | CONFIG_INOTIFY_USER=y | ||
749 | # CONFIG_QUOTA is not set | ||
750 | CONFIG_DNOTIFY=y | ||
751 | # CONFIG_AUTOFS_FS is not set | ||
752 | # CONFIG_AUTOFS4_FS is not set | ||
753 | CONFIG_FUSE_FS=m | ||
754 | CONFIG_GENERIC_ACL=y | ||
755 | |||
756 | # | ||
757 | # CD-ROM/DVD Filesystems | ||
758 | # | ||
759 | # CONFIG_ISO9660_FS is not set | ||
760 | # CONFIG_UDF_FS is not set | ||
761 | |||
762 | # | ||
763 | # DOS/FAT/NT Filesystems | ||
764 | # | ||
765 | # CONFIG_MSDOS_FS is not set | ||
766 | # CONFIG_VFAT_FS is not set | ||
767 | # CONFIG_NTFS_FS is not set | ||
768 | |||
769 | # | ||
770 | # Pseudo filesystems | ||
771 | # | ||
772 | CONFIG_PROC_FS=y | ||
773 | CONFIG_PROC_KCORE=y | ||
774 | CONFIG_PROC_SYSCTL=y | ||
775 | CONFIG_SYSFS=y | ||
776 | CONFIG_TMPFS=y | ||
777 | CONFIG_TMPFS_POSIX_ACL=y | ||
778 | # CONFIG_HUGETLB_PAGE is not set | ||
779 | CONFIG_RAMFS=y | ||
780 | |||
781 | # | ||
782 | # Miscellaneous filesystems | ||
783 | # | ||
784 | # CONFIG_HFSPLUS_FS is not set | ||
785 | # CONFIG_CRAMFS is not set | ||
786 | # CONFIG_VXFS_FS is not set | ||
787 | # CONFIG_HPFS_FS is not set | ||
788 | # CONFIG_QNX4FS_FS is not set | ||
789 | # CONFIG_SYSV_FS is not set | ||
790 | # CONFIG_UFS_FS is not set | ||
791 | |||
792 | # | ||
793 | # Network File Systems | ||
794 | # | ||
795 | CONFIG_NFS_FS=y | ||
796 | # CONFIG_NFS_V3 is not set | ||
797 | # CONFIG_NFS_DIRECTIO is not set | ||
798 | # CONFIG_NFSD is not set | ||
799 | CONFIG_ROOT_NFS=y | ||
800 | CONFIG_LOCKD=y | ||
801 | CONFIG_NFS_COMMON=y | ||
802 | CONFIG_SUNRPC=y | ||
803 | # CONFIG_SMB_FS is not set | ||
804 | # CONFIG_CIFS is not set | ||
805 | # CONFIG_NCP_FS is not set | ||
806 | # CONFIG_CODA_FS is not set | ||
807 | |||
808 | # | ||
809 | # Partition Types | ||
810 | # | ||
811 | # CONFIG_PARTITION_ADVANCED is not set | ||
812 | CONFIG_MSDOS_PARTITION=y | ||
813 | |||
814 | # | ||
815 | # Native Language Support | ||
816 | # | ||
817 | # CONFIG_NLS is not set | ||
818 | |||
819 | # | ||
820 | # Kernel hacking | ||
821 | # | ||
822 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
823 | # CONFIG_PRINTK_TIME is not set | ||
824 | CONFIG_ENABLE_MUST_CHECK=y | ||
825 | # CONFIG_MAGIC_SYSRQ is not set | ||
826 | # CONFIG_UNUSED_SYMBOLS is not set | ||
827 | # CONFIG_DEBUG_FS is not set | ||
828 | # CONFIG_HEADERS_CHECK is not set | ||
829 | # CONFIG_DEBUG_KERNEL is not set | ||
830 | CONFIG_LOG_BUF_SHIFT=14 | ||
831 | CONFIG_CROSSCOMPILE=y | ||
832 | CONFIG_CMDLINE="" | ||
833 | CONFIG_SYS_SUPPORTS_KGDB=y | ||
834 | |||
835 | # | ||
836 | # Security options | ||
837 | # | ||
838 | CONFIG_KEYS=y | ||
839 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
840 | # CONFIG_SECURITY is not set | ||
841 | |||
842 | # | ||
843 | # Cryptographic options | ||
844 | # | ||
845 | CONFIG_CRYPTO=y | ||
846 | CONFIG_CRYPTO_ALGAPI=y | ||
847 | CONFIG_CRYPTO_BLKCIPHER=m | ||
848 | CONFIG_CRYPTO_HASH=y | ||
849 | CONFIG_CRYPTO_MANAGER=y | ||
850 | CONFIG_CRYPTO_HMAC=y | ||
851 | CONFIG_CRYPTO_NULL=m | ||
852 | CONFIG_CRYPTO_MD4=m | ||
853 | CONFIG_CRYPTO_MD5=m | ||
854 | CONFIG_CRYPTO_SHA1=m | ||
855 | CONFIG_CRYPTO_SHA256=m | ||
856 | CONFIG_CRYPTO_SHA512=m | ||
857 | CONFIG_CRYPTO_WP512=m | ||
858 | CONFIG_CRYPTO_TGR192=m | ||
859 | CONFIG_CRYPTO_ECB=m | ||
860 | CONFIG_CRYPTO_CBC=m | ||
861 | CONFIG_CRYPTO_PCBC=m | ||
862 | CONFIG_CRYPTO_DES=m | ||
863 | CONFIG_CRYPTO_FCRYPT=m | ||
864 | CONFIG_CRYPTO_BLOWFISH=m | ||
865 | CONFIG_CRYPTO_TWOFISH=m | ||
866 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
867 | CONFIG_CRYPTO_SERPENT=m | ||
868 | CONFIG_CRYPTO_AES=m | ||
869 | CONFIG_CRYPTO_CAST5=m | ||
870 | CONFIG_CRYPTO_CAST6=m | ||
871 | CONFIG_CRYPTO_TEA=m | ||
872 | CONFIG_CRYPTO_ARC4=m | ||
873 | CONFIG_CRYPTO_KHAZAD=m | ||
874 | CONFIG_CRYPTO_ANUBIS=m | ||
875 | CONFIG_CRYPTO_DEFLATE=m | ||
876 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
877 | CONFIG_CRYPTO_CRC32C=m | ||
878 | CONFIG_CRYPTO_CAMELLIA=m | ||
879 | # CONFIG_CRYPTO_TEST is not set | ||
880 | |||
881 | # | ||
882 | # Hardware crypto devices | ||
883 | # | ||
884 | |||
885 | # | ||
886 | # Library routines | ||
887 | # | ||
888 | CONFIG_BITREVERSE=m | ||
889 | # CONFIG_CRC_CCITT is not set | ||
890 | CONFIG_CRC16=m | ||
891 | CONFIG_CRC32=m | ||
892 | CONFIG_LIBCRC32C=m | ||
893 | CONFIG_ZLIB_INFLATE=m | ||
894 | CONFIG_ZLIB_DEFLATE=m | ||
895 | CONFIG_PLIST=y | ||
896 | CONFIG_HAS_IOMEM=y | ||
897 | CONFIG_HAS_IOPORT=y | ||
diff --git a/arch/mips/momentum/Kconfig b/arch/mips/momentum/Kconfig deleted file mode 100644 index 70a61cf7174d..000000000000 --- a/arch/mips/momentum/Kconfig +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | config JAGUAR_DMALOW | ||
2 | bool "Low DMA Mode" | ||
3 | depends on MOMENCO_JAGUAR_ATX | ||
4 | help | ||
5 | Select to Y if jump JP5 is set on your board, N otherwise. Normally | ||
6 | the jumper is set, so if you feel unsafe, just say Y. | ||
diff --git a/arch/mips/momentum/jaguar_atx/Makefile b/arch/mips/momentum/jaguar_atx/Makefile deleted file mode 100644 index 2e8cebd49bc0..000000000000 --- a/arch/mips/momentum/jaguar_atx/Makefile +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for Momentum Computer's Jaguar-ATX board. | ||
3 | # | ||
4 | # Note! Dependencies are done automagically by 'make dep', which also | ||
5 | # removes any old dependencies. DON'T put your own dependencies here | ||
6 | # unless it's something special (ie not a .c file). | ||
7 | # | ||
8 | |||
9 | obj-y += irq.o platform.o prom.o reset.o setup.o | ||
10 | |||
11 | obj-$(CONFIG_SERIAL_8250_CONSOLE) += ja-console.o | ||
12 | obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o | ||
diff --git a/arch/mips/momentum/jaguar_atx/dbg_io.c b/arch/mips/momentum/jaguar_atx/dbg_io.c deleted file mode 100644 index b85a6521f72d..000000000000 --- a/arch/mips/momentum/jaguar_atx/dbg_io.c +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | |||
2 | #if defined(CONFIG_REMOTE_DEBUG) | ||
3 | |||
4 | #include <asm/serial.h> /* For the serial port location and base baud */ | ||
5 | |||
6 | /* --- CONFIG --- */ | ||
7 | |||
8 | typedef unsigned char uint8; | ||
9 | typedef unsigned int uint32; | ||
10 | |||
11 | /* --- END OF CONFIG --- */ | ||
12 | |||
13 | #define UART16550_BAUD_2400 2400 | ||
14 | #define UART16550_BAUD_4800 4800 | ||
15 | #define UART16550_BAUD_9600 9600 | ||
16 | #define UART16550_BAUD_19200 19200 | ||
17 | #define UART16550_BAUD_38400 38400 | ||
18 | #define UART16550_BAUD_57600 57600 | ||
19 | #define UART16550_BAUD_115200 115200 | ||
20 | |||
21 | #define UART16550_PARITY_NONE 0 | ||
22 | #define UART16550_PARITY_ODD 0x08 | ||
23 | #define UART16550_PARITY_EVEN 0x18 | ||
24 | #define UART16550_PARITY_MARK 0x28 | ||
25 | #define UART16550_PARITY_SPACE 0x38 | ||
26 | |||
27 | #define UART16550_DATA_5BIT 0x0 | ||
28 | #define UART16550_DATA_6BIT 0x1 | ||
29 | #define UART16550_DATA_7BIT 0x2 | ||
30 | #define UART16550_DATA_8BIT 0x3 | ||
31 | |||
32 | #define UART16550_STOP_1BIT 0x0 | ||
33 | #define UART16550_STOP_2BIT 0x4 | ||
34 | |||
35 | /* ----------------------------------------------------- */ | ||
36 | |||
37 | /* === CONFIG === */ | ||
38 | |||
39 | /* [jsun] we use the second serial port for kdb */ | ||
40 | #define BASE OCELOT_SERIAL1_BASE | ||
41 | #define MAX_BAUD OCELOT_BASE_BAUD | ||
42 | |||
43 | /* === END OF CONFIG === */ | ||
44 | |||
45 | #define REG_OFFSET 4 | ||
46 | |||
47 | /* register offset */ | ||
48 | #define OFS_RCV_BUFFER 0 | ||
49 | #define OFS_TRANS_HOLD 0 | ||
50 | #define OFS_SEND_BUFFER 0 | ||
51 | #define OFS_INTR_ENABLE (1*REG_OFFSET) | ||
52 | #define OFS_INTR_ID (2*REG_OFFSET) | ||
53 | #define OFS_DATA_FORMAT (3*REG_OFFSET) | ||
54 | #define OFS_LINE_CONTROL (3*REG_OFFSET) | ||
55 | #define OFS_MODEM_CONTROL (4*REG_OFFSET) | ||
56 | #define OFS_RS232_OUTPUT (4*REG_OFFSET) | ||
57 | #define OFS_LINE_STATUS (5*REG_OFFSET) | ||
58 | #define OFS_MODEM_STATUS (6*REG_OFFSET) | ||
59 | #define OFS_RS232_INPUT (6*REG_OFFSET) | ||
60 | #define OFS_SCRATCH_PAD (7*REG_OFFSET) | ||
61 | |||
62 | #define OFS_DIVISOR_LSB (0*REG_OFFSET) | ||
63 | #define OFS_DIVISOR_MSB (1*REG_OFFSET) | ||
64 | |||
65 | |||
66 | /* memory-mapped read/write of the port */ | ||
67 | #define UART16550_READ(y) (*((volatile uint8*)(BASE + y))) | ||
68 | #define UART16550_WRITE(y, z) ((*((volatile uint8*)(BASE + y))) = z) | ||
69 | |||
70 | void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) | ||
71 | { | ||
72 | /* disable interrupts */ | ||
73 | UART16550_WRITE(OFS_INTR_ENABLE, 0); | ||
74 | |||
75 | /* set up baud rate */ | ||
76 | { | ||
77 | uint32 divisor; | ||
78 | |||
79 | /* set DIAB bit */ | ||
80 | UART16550_WRITE(OFS_LINE_CONTROL, 0x80); | ||
81 | |||
82 | /* set divisor */ | ||
83 | divisor = MAX_BAUD / baud; | ||
84 | UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff); | ||
85 | UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00) >> 8); | ||
86 | |||
87 | /* clear DIAB bit */ | ||
88 | UART16550_WRITE(OFS_LINE_CONTROL, 0x0); | ||
89 | } | ||
90 | |||
91 | /* set data format */ | ||
92 | UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop); | ||
93 | } | ||
94 | |||
95 | static int remoteDebugInitialized = 0; | ||
96 | |||
97 | uint8 getDebugChar(void) | ||
98 | { | ||
99 | if (!remoteDebugInitialized) { | ||
100 | remoteDebugInitialized = 1; | ||
101 | debugInit(UART16550_BAUD_38400, | ||
102 | UART16550_DATA_8BIT, | ||
103 | UART16550_PARITY_NONE, UART16550_STOP_1BIT); | ||
104 | } | ||
105 | |||
106 | while ((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0); | ||
107 | return UART16550_READ(OFS_RCV_BUFFER); | ||
108 | } | ||
109 | |||
110 | |||
111 | int putDebugChar(uint8 byte) | ||
112 | { | ||
113 | if (!remoteDebugInitialized) { | ||
114 | remoteDebugInitialized = 1; | ||
115 | debugInit(UART16550_BAUD_38400, | ||
116 | UART16550_DATA_8BIT, | ||
117 | UART16550_PARITY_NONE, UART16550_STOP_1BIT); | ||
118 | } | ||
119 | |||
120 | while ((UART16550_READ(OFS_LINE_STATUS) & 0x20) == 0); | ||
121 | UART16550_WRITE(OFS_SEND_BUFFER, byte); | ||
122 | return 1; | ||
123 | } | ||
124 | |||
125 | #endif | ||
diff --git a/arch/mips/momentum/jaguar_atx/irq.c b/arch/mips/momentum/jaguar_atx/irq.c deleted file mode 100644 index f2b432585df2..000000000000 --- a/arch/mips/momentum/jaguar_atx/irq.c +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 Momentum Computer, Inc. | ||
3 | * Author: Matthew Dharm, mdharm@momenco.com | ||
4 | * | ||
5 | * Based on work by: | ||
6 | * Copyright (C) 2000 RidgeRun, Inc. | ||
7 | * Author: RidgeRun, Inc. | ||
8 | * glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com | ||
9 | * | ||
10 | * Copyright 2001 MontaVista Software Inc. | ||
11 | * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net | ||
12 | * | ||
13 | * Copyright (C) 2000, 01, 06 Ralf Baechle (ralf@linux-mips.org) | ||
14 | * | ||
15 | * This program is free software; you can redistribute it and/or modify it | ||
16 | * under the terms of the GNU General Public License as published by the | ||
17 | * Free Software Foundation; either version 2 of the License, or (at your | ||
18 | * option) any later version. | ||
19 | * | ||
20 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
21 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
22 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
23 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
24 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
25 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
26 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
27 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
28 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
29 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
30 | * | ||
31 | * You should have received a copy of the GNU General Public License along | ||
32 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
34 | */ | ||
35 | #include <linux/init.h> | ||
36 | #include <linux/interrupt.h> | ||
37 | #include <linux/signal.h> | ||
38 | #include <linux/types.h> | ||
39 | #include <asm/irq_cpu.h> | ||
40 | #include <asm/mipsregs.h> | ||
41 | #include <asm/time.h> | ||
42 | |||
43 | asmlinkage void plat_irq_dispatch(void) | ||
44 | { | ||
45 | unsigned int pending = read_c0_cause() & read_c0_status(); | ||
46 | |||
47 | if (pending & STATUSF_IP0) | ||
48 | do_IRQ(0); | ||
49 | else if (pending & STATUSF_IP1) | ||
50 | do_IRQ(1); | ||
51 | else if (pending & STATUSF_IP2) | ||
52 | do_IRQ(2); | ||
53 | else if (pending & STATUSF_IP3) | ||
54 | do_IRQ(3); | ||
55 | else if (pending & STATUSF_IP4) | ||
56 | do_IRQ(4); | ||
57 | else if (pending & STATUSF_IP5) | ||
58 | do_IRQ(5); | ||
59 | else if (pending & STATUSF_IP6) | ||
60 | do_IRQ(6); | ||
61 | else if (pending & STATUSF_IP7) | ||
62 | ll_timer_interrupt(7); | ||
63 | else { | ||
64 | /* | ||
65 | * Now look at the extended interrupts | ||
66 | */ | ||
67 | pending = (read_c0_cause() & (read_c0_intcontrol() << 8)) >> 16; | ||
68 | if (pending & STATUSF_IP8) | ||
69 | ll_mv64340_irq(); | ||
70 | } | ||
71 | } | ||
72 | |||
73 | static struct irqaction cascade_mv64340 = { | ||
74 | no_action, IRQF_DISABLED, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL | ||
75 | }; | ||
76 | |||
77 | void __init arch_init_irq(void) | ||
78 | { | ||
79 | /* | ||
80 | * Clear all of the interrupts while we change the able around a bit. | ||
81 | * int-handler is not on bootstrap | ||
82 | */ | ||
83 | clear_c0_status(ST0_IM); | ||
84 | |||
85 | mips_cpu_irq_init(); | ||
86 | rm7k_cpu_irq_init(); | ||
87 | |||
88 | /* set up the cascading interrupts */ | ||
89 | setup_irq(8, &cascade_mv64340); | ||
90 | |||
91 | mv64340_irq_init(16); | ||
92 | |||
93 | set_c0_status(ST0_IM); | ||
94 | } | ||
diff --git a/arch/mips/momentum/jaguar_atx/ja-console.c b/arch/mips/momentum/jaguar_atx/ja-console.c deleted file mode 100644 index 2c30b4f56245..000000000000 --- a/arch/mips/momentum/jaguar_atx/ja-console.c +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2001, 2002, 2004 Ralf Baechle | ||
7 | */ | ||
8 | #include <linux/init.h> | ||
9 | #include <linux/console.h> | ||
10 | #include <linux/kdev_t.h> | ||
11 | #include <linux/major.h> | ||
12 | #include <linux/termios.h> | ||
13 | #include <linux/sched.h> | ||
14 | #include <linux/tty.h> | ||
15 | |||
16 | #include <linux/serial.h> | ||
17 | #include <linux/serial_core.h> | ||
18 | #include <asm/serial.h> | ||
19 | |||
20 | /* SUPERIO uart register map */ | ||
21 | struct ja_uartregs { | ||
22 | union { | ||
23 | volatile u8 pad0[3]; | ||
24 | volatile u8 rbr; /* read only, DLAB == 0 */ | ||
25 | volatile u8 pad1[3]; | ||
26 | volatile u8 thr; /* write only, DLAB == 0 */ | ||
27 | volatile u8 pad2[3]; | ||
28 | volatile u8 dll; /* DLAB == 1 */ | ||
29 | } u1; | ||
30 | union { | ||
31 | volatile u8 pad0[3]; | ||
32 | volatile u8 ier; /* DLAB == 0 */ | ||
33 | volatile u8 pad1[3]; | ||
34 | volatile u8 dlm; /* DLAB == 1 */ | ||
35 | } u2; | ||
36 | union { | ||
37 | volatile u8 pad0[3]; | ||
38 | volatile u8 iir; /* read only */ | ||
39 | volatile u8 pad1[3]; | ||
40 | volatile u8 fcr; /* write only */ | ||
41 | } u3; | ||
42 | volatile u8 pad0[3]; | ||
43 | volatile u8 iu_lcr; | ||
44 | volatile u8 pad1[3]; | ||
45 | volatile u8 iu_mcr; | ||
46 | volatile u8 pad2[3]; | ||
47 | volatile u8 iu_lsr; | ||
48 | volatile u8 pad3[3]; | ||
49 | volatile u8 iu_msr; | ||
50 | volatile u8 pad4[3]; | ||
51 | volatile u8 iu_scr; | ||
52 | } ja_uregs_t; | ||
53 | |||
54 | #define iu_rbr u1.rbr | ||
55 | #define iu_thr u1.thr | ||
56 | #define iu_dll u1.dll | ||
57 | #define iu_ier u2.ier | ||
58 | #define iu_dlm u2.dlm | ||
59 | #define iu_iir u3.iir | ||
60 | #define iu_fcr u3.fcr | ||
61 | |||
62 | extern unsigned long uart_base; | ||
63 | |||
64 | static inline struct ja_uartregs *console_uart(void) | ||
65 | { | ||
66 | return (struct ja_uartregs *) (uart_base + 0x23UL); | ||
67 | } | ||
68 | |||
69 | void prom_putchar(char c) | ||
70 | { | ||
71 | struct ja_uartregs *uart = console_uart(); | ||
72 | |||
73 | while ((uart->iu_lsr & 0x20) == 0); | ||
74 | uart->iu_thr = c; | ||
75 | } | ||
76 | |||
77 | static void inline ja_console_probe(void) | ||
78 | { | ||
79 | struct uart_port up; | ||
80 | |||
81 | /* | ||
82 | * Register to interrupt zero because we share the interrupt with | ||
83 | * the serial driver which we don't properly support yet. | ||
84 | */ | ||
85 | memset(&up, 0, sizeof(up)); | ||
86 | up.membase = (unsigned char *) uart_base + 0x23UL; | ||
87 | up.irq = JAGUAR_ATX_SERIAL1_IRQ; | ||
88 | up.uartclk = JAGUAR_ATX_UART_CLK; | ||
89 | up.regshift = 2; | ||
90 | up.iotype = UPIO_MEM; | ||
91 | up.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; | ||
92 | up.line = 0; | ||
93 | |||
94 | if (early_serial_setup(&up)) | ||
95 | printk(KERN_ERR "Early serial init of port 0 failed\n"); | ||
96 | } | ||
97 | |||
98 | __init void ja_setup_console(void) | ||
99 | { | ||
100 | ja_console_probe(); | ||
101 | } | ||
diff --git a/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h b/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h deleted file mode 100644 index 022f6974b76e..000000000000 --- a/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | /* | ||
2 | * Jaguar-ATX Board Register Definitions | ||
3 | * | ||
4 | * (C) 2002 Momentum Computer Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | * | ||
11 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
12 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
13 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
14 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
15 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
16 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
17 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
18 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
19 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
20 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
21 | * | ||
22 | * You should have received a copy of the GNU General Public License along | ||
23 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
25 | */ | ||
26 | #ifndef __JAGUAR_ATX_FPGA_H__ | ||
27 | #define __JAGUAR_ATX_FPGA_H__ | ||
28 | |||
29 | #define JAGUAR_ATX_REG_BOARDREV 0x0 | ||
30 | #define JAGUAR_ATX_REG_FPGA_REV 0x1 | ||
31 | #define JAGUAR_ATX_REG_FPGA_TYPE 0x2 | ||
32 | #define JAGUAR_ATX_REG_RESET_STATUS 0x3 | ||
33 | #define JAGUAR_ATX_REG_BOARD_STATUS 0x4 | ||
34 | #define JAGUAR_ATX_REG_RESERVED1 0x5 | ||
35 | #define JAGUAR_ATX_REG_SET 0x6 | ||
36 | #define JAGUAR_ATX_REG_CLR 0x7 | ||
37 | #define JAGUAR_ATX_REG_EEPROM_MODE 0x9 | ||
38 | #define JAGUAR_ATX_REG_RESERVED2 0xa | ||
39 | #define JAGUAR_ATX_REG_RESERVED3 0xb | ||
40 | #define JAGUAR_ATX_REG_RESERVED4 0xc | ||
41 | #define JAGUAR_ATX_REG_PHY_INTSTAT 0xd | ||
42 | #define JAGUAR_ATX_REG_RESERVED5 0xe | ||
43 | #define JAGUAR_ATX_REG_RESERVED6 0xf | ||
44 | |||
45 | #define JAGUAR_ATX_CS0_ADDR 0xfc000000L | ||
46 | |||
47 | extern unsigned long ja_fpga_base; | ||
48 | |||
49 | #define __FPGA_REG_TO_ADDR(reg) \ | ||
50 | ((void *) ja_fpga_base + JAGUAR_ATX_REG_##reg) | ||
51 | #define JAGUAR_FPGA_WRITE(x, reg) writeb(x, __FPGA_REG_TO_ADDR(reg)) | ||
52 | #define JAGUAR_FPGA_READ(reg) readb(__FPGA_REG_TO_ADDR(reg)) | ||
53 | |||
54 | #endif | ||
diff --git a/arch/mips/momentum/jaguar_atx/platform.c b/arch/mips/momentum/jaguar_atx/platform.c deleted file mode 100644 index 561844878a90..000000000000 --- a/arch/mips/momentum/jaguar_atx/platform.c +++ /dev/null | |||
@@ -1,208 +0,0 @@ | |||
1 | #include <linux/delay.h> | ||
2 | #include <linux/if_ether.h> | ||
3 | #include <linux/ioport.h> | ||
4 | #include <linux/mv643xx.h> | ||
5 | #include <linux/platform_device.h> | ||
6 | |||
7 | #include "jaguar_atx_fpga.h" | ||
8 | |||
9 | #if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) | ||
10 | |||
11 | static struct resource mv643xx_eth_shared_resources[] = { | ||
12 | [0] = { | ||
13 | .name = "ethernet shared base", | ||
14 | .start = 0xf1000000 + MV643XX_ETH_SHARED_REGS, | ||
15 | .end = 0xf1000000 + MV643XX_ETH_SHARED_REGS + | ||
16 | MV643XX_ETH_SHARED_REGS_SIZE - 1, | ||
17 | .flags = IORESOURCE_MEM, | ||
18 | }, | ||
19 | }; | ||
20 | |||
21 | static struct platform_device mv643xx_eth_shared_device = { | ||
22 | .name = MV643XX_ETH_SHARED_NAME, | ||
23 | .id = 0, | ||
24 | .num_resources = ARRAY_SIZE(mv643xx_eth_shared_resources), | ||
25 | .resource = mv643xx_eth_shared_resources, | ||
26 | }; | ||
27 | |||
28 | #define MV_SRAM_BASE 0xfe000000UL | ||
29 | #define MV_SRAM_SIZE (256 * 1024) | ||
30 | |||
31 | #define MV_SRAM_RXRING_SIZE (MV_SRAM_SIZE / 4) | ||
32 | #define MV_SRAM_TXRING_SIZE (MV_SRAM_SIZE / 4) | ||
33 | |||
34 | #define MV_SRAM_BASE_ETH0 MV_SRAM_BASE | ||
35 | #define MV_SRAM_BASE_ETH1 (MV_SRAM_BASE + (MV_SRAM_SIZE / 2)) | ||
36 | |||
37 | #define MV64x60_IRQ_ETH_0 48 | ||
38 | #define MV64x60_IRQ_ETH_1 49 | ||
39 | #define MV64x60_IRQ_ETH_2 50 | ||
40 | |||
41 | static struct resource mv64x60_eth0_resources[] = { | ||
42 | [0] = { | ||
43 | .name = "eth0 irq", | ||
44 | .start = MV64x60_IRQ_ETH_0, | ||
45 | .end = MV64x60_IRQ_ETH_0, | ||
46 | .flags = IORESOURCE_IRQ, | ||
47 | }, | ||
48 | }; | ||
49 | |||
50 | static struct mv643xx_eth_platform_data eth0_pd = { | ||
51 | .port_number = 0, | ||
52 | |||
53 | .tx_sram_addr = MV_SRAM_BASE_ETH0, | ||
54 | .tx_sram_size = MV_SRAM_TXRING_SIZE, | ||
55 | .tx_queue_size = MV_SRAM_TXRING_SIZE / 16, | ||
56 | |||
57 | .rx_sram_addr = MV_SRAM_BASE_ETH0 + MV_SRAM_TXRING_SIZE, | ||
58 | .rx_sram_size = MV_SRAM_RXRING_SIZE, | ||
59 | .rx_queue_size = MV_SRAM_RXRING_SIZE / 16, | ||
60 | }; | ||
61 | |||
62 | static struct platform_device eth0_device = { | ||
63 | .name = MV643XX_ETH_NAME, | ||
64 | .id = 0, | ||
65 | .num_resources = ARRAY_SIZE(mv64x60_eth0_resources), | ||
66 | .resource = mv64x60_eth0_resources, | ||
67 | .dev = { | ||
68 | .platform_data = ð0_pd, | ||
69 | }, | ||
70 | }; | ||
71 | |||
72 | static struct resource mv64x60_eth1_resources[] = { | ||
73 | [0] = { | ||
74 | .name = "eth1 irq", | ||
75 | .start = MV64x60_IRQ_ETH_1, | ||
76 | .end = MV64x60_IRQ_ETH_1, | ||
77 | .flags = IORESOURCE_IRQ, | ||
78 | }, | ||
79 | }; | ||
80 | |||
81 | static struct mv643xx_eth_platform_data eth1_pd = { | ||
82 | .port_number = 1, | ||
83 | |||
84 | .tx_sram_addr = MV_SRAM_BASE_ETH1, | ||
85 | .tx_sram_size = MV_SRAM_TXRING_SIZE, | ||
86 | .tx_queue_size = MV_SRAM_TXRING_SIZE / 16, | ||
87 | |||
88 | .rx_sram_addr = MV_SRAM_BASE_ETH1 + MV_SRAM_TXRING_SIZE, | ||
89 | .rx_sram_size = MV_SRAM_RXRING_SIZE, | ||
90 | .rx_queue_size = MV_SRAM_RXRING_SIZE / 16, | ||
91 | }; | ||
92 | |||
93 | static struct platform_device eth1_device = { | ||
94 | .name = MV643XX_ETH_NAME, | ||
95 | .id = 1, | ||
96 | .num_resources = ARRAY_SIZE(mv64x60_eth1_resources), | ||
97 | .resource = mv64x60_eth1_resources, | ||
98 | .dev = { | ||
99 | .platform_data = ð1_pd, | ||
100 | }, | ||
101 | }; | ||
102 | |||
103 | static struct resource mv64x60_eth2_resources[] = { | ||
104 | [0] = { | ||
105 | .name = "eth2 irq", | ||
106 | .start = MV64x60_IRQ_ETH_2, | ||
107 | .end = MV64x60_IRQ_ETH_2, | ||
108 | .flags = IORESOURCE_IRQ, | ||
109 | }, | ||
110 | }; | ||
111 | |||
112 | static struct mv643xx_eth_platform_data eth2_pd = { | ||
113 | .port_number = 2, | ||
114 | }; | ||
115 | |||
116 | static struct platform_device eth2_device = { | ||
117 | .name = MV643XX_ETH_NAME, | ||
118 | .id = 2, | ||
119 | .num_resources = ARRAY_SIZE(mv64x60_eth2_resources), | ||
120 | .resource = mv64x60_eth2_resources, | ||
121 | .dev = { | ||
122 | .platform_data = ð2_pd, | ||
123 | }, | ||
124 | }; | ||
125 | |||
126 | static struct platform_device *mv643xx_eth_pd_devs[] __initdata = { | ||
127 | &mv643xx_eth_shared_device, | ||
128 | ð0_device, | ||
129 | ð1_device, | ||
130 | ð2_device, | ||
131 | }; | ||
132 | |||
133 | static u8 __init exchange_bit(u8 val, u8 cs) | ||
134 | { | ||
135 | /* place the data */ | ||
136 | JAGUAR_FPGA_WRITE((val << 2) | cs, EEPROM_MODE); | ||
137 | udelay(1); | ||
138 | |||
139 | /* turn the clock on */ | ||
140 | JAGUAR_FPGA_WRITE((val << 2) | cs | 0x2, EEPROM_MODE); | ||
141 | udelay(1); | ||
142 | |||
143 | /* turn the clock off and read-strobe */ | ||
144 | JAGUAR_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE); | ||
145 | |||
146 | /* return the data */ | ||
147 | return (JAGUAR_FPGA_READ(EEPROM_MODE) >> 3) & 0x1; | ||
148 | } | ||
149 | |||
150 | static void __init get_mac(char dest[6]) | ||
151 | { | ||
152 | u8 read_opcode[12] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; | ||
153 | int i,j; | ||
154 | |||
155 | for (i = 0; i < 12; i++) | ||
156 | exchange_bit(read_opcode[i], 1); | ||
157 | |||
158 | for (j = 0; j < 6; j++) { | ||
159 | dest[j] = 0; | ||
160 | for (i = 0; i < 8; i++) { | ||
161 | dest[j] <<= 1; | ||
162 | dest[j] |= exchange_bit(0, 1); | ||
163 | } | ||
164 | } | ||
165 | |||
166 | /* turn off CS */ | ||
167 | exchange_bit(0,0); | ||
168 | } | ||
169 | |||
170 | /* | ||
171 | * Copy and increment ethernet MAC address by a small value. | ||
172 | * | ||
173 | * This is useful for systems where the only one MAC address is stored in | ||
174 | * non-volatile memory for multiple ports. | ||
175 | */ | ||
176 | static inline void eth_mac_add(unsigned char *dst, unsigned char *src, | ||
177 | unsigned int add) | ||
178 | { | ||
179 | int i; | ||
180 | |||
181 | BUG_ON(add >= 256); | ||
182 | |||
183 | for (i = ETH_ALEN; i >= 0; i--) { | ||
184 | dst[i] = src[i] + add; | ||
185 | add = dst[i] < src[i]; /* compute carry */ | ||
186 | } | ||
187 | |||
188 | WARN_ON(add); | ||
189 | } | ||
190 | |||
191 | static int __init mv643xx_eth_add_pds(void) | ||
192 | { | ||
193 | unsigned char mac[ETH_ALEN]; | ||
194 | int ret; | ||
195 | |||
196 | get_mac(mac); | ||
197 | eth_mac_add(eth0_pd.mac_addr, mac, 0); | ||
198 | eth_mac_add(eth1_pd.mac_addr, mac, 1); | ||
199 | eth_mac_add(eth2_pd.mac_addr, mac, 2); | ||
200 | ret = platform_add_devices(mv643xx_eth_pd_devs, | ||
201 | ARRAY_SIZE(mv643xx_eth_pd_devs)); | ||
202 | |||
203 | return ret; | ||
204 | } | ||
205 | |||
206 | device_initcall(mv643xx_eth_add_pds); | ||
207 | |||
208 | #endif /* defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) */ | ||
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c deleted file mode 100644 index 5dd154ee58f6..000000000000 --- a/arch/mips/momentum/jaguar_atx/prom.c +++ /dev/null | |||
@@ -1,210 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2002 Momentum Computer Inc. | ||
3 | * Author: Matthew Dharm <mdharm@momenco.com> | ||
4 | * | ||
5 | * Louis Hamilton, Red Hat, Inc. | ||
6 | * hamilton@redhat.com [MIPS64 modifications] | ||
7 | * | ||
8 | * Based on Ocelot Linux port, which is | ||
9 | * Copyright 2001 MontaVista Software Inc. | ||
10 | * Author: jsun@mvista.com or jsun@junsun.net | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or modify it | ||
13 | * under the terms of the GNU General Public License as published by the | ||
14 | * Free Software Foundation; either version 2 of the License, or (at your | ||
15 | * option) any later version. | ||
16 | * | ||
17 | * Added changes for SMP - Manish Lachwani (lachwani@pmc-sierra.com) | ||
18 | */ | ||
19 | #include <linux/init.h> | ||
20 | #include <linux/mm.h> | ||
21 | #include <linux/sched.h> | ||
22 | #include <linux/bootmem.h> | ||
23 | #include <linux/mv643xx.h> | ||
24 | |||
25 | #include <asm/addrspace.h> | ||
26 | #include <asm/bootinfo.h> | ||
27 | #include <asm/pmon.h> | ||
28 | |||
29 | #include "jaguar_atx_fpga.h" | ||
30 | |||
31 | extern void ja_setup_console(void); | ||
32 | |||
33 | struct callvectors *debug_vectors; | ||
34 | |||
35 | extern unsigned long cpu_clock; | ||
36 | |||
37 | const char *get_system_type(void) | ||
38 | { | ||
39 | return "Momentum Jaguar-ATX"; | ||
40 | } | ||
41 | |||
42 | #ifdef CONFIG_64BIT | ||
43 | |||
44 | unsigned long signext(unsigned long addr) | ||
45 | { | ||
46 | addr &= 0xffffffff; | ||
47 | return (unsigned long)((int)addr); | ||
48 | } | ||
49 | |||
50 | void *get_arg(unsigned long args, int arc) | ||
51 | { | ||
52 | unsigned long ul; | ||
53 | unsigned char *puc, uc; | ||
54 | |||
55 | args += (arc * 4); | ||
56 | ul = (unsigned long)signext(args); | ||
57 | puc = (unsigned char *)ul; | ||
58 | if (puc == 0) | ||
59 | return (void *)0; | ||
60 | |||
61 | #ifdef CONFIG_CPU_LITTLE_ENDIAN | ||
62 | uc = *puc++; | ||
63 | l = (unsigned long)uc; | ||
64 | uc = *puc++; | ||
65 | ul |= (((unsigned long)uc) << 8); | ||
66 | uc = *puc++; | ||
67 | ul |= (((unsigned long)uc) << 16); | ||
68 | uc = *puc++; | ||
69 | ul |= (((unsigned long)uc) << 24); | ||
70 | #else | ||
71 | uc = *puc++; | ||
72 | ul = ((unsigned long)uc) << 24; | ||
73 | uc = *puc++; | ||
74 | ul |= (((unsigned long)uc) << 16); | ||
75 | uc = *puc++; | ||
76 | ul |= (((unsigned long)uc) << 8); | ||
77 | uc = *puc++; | ||
78 | ul |= ((unsigned long)uc); | ||
79 | #endif | ||
80 | ul = signext(ul); | ||
81 | |||
82 | return (void *)ul; | ||
83 | } | ||
84 | |||
85 | char *arg64(unsigned long addrin, int arg_index) | ||
86 | { | ||
87 | unsigned long args; | ||
88 | char *p; | ||
89 | |||
90 | args = signext(addrin); | ||
91 | p = (char *)get_arg(args, arg_index); | ||
92 | |||
93 | return p; | ||
94 | } | ||
95 | #endif /* CONFIG_64BIT */ | ||
96 | |||
97 | /* PMON passes arguments in C main() style */ | ||
98 | void __init prom_init(void) | ||
99 | { | ||
100 | int argc = fw_arg0; | ||
101 | char **arg = (char **) fw_arg1; | ||
102 | char **env = (char **) fw_arg2; | ||
103 | struct callvectors *cv = (struct callvectors *) fw_arg3; | ||
104 | int i; | ||
105 | |||
106 | #ifdef CONFIG_SERIAL_8250_CONSOLE | ||
107 | // ja_setup_console(); /* The very first thing. */ | ||
108 | #endif | ||
109 | |||
110 | #ifdef CONFIG_64BIT | ||
111 | char *ptr; | ||
112 | |||
113 | printk("Mips64 Jaguar-ATX\n"); | ||
114 | /* save the PROM vectors for debugging use */ | ||
115 | debug_vectors = (struct callvectors *)signext((unsigned long)cv); | ||
116 | |||
117 | /* arg[0] is "g", the rest is boot parameters */ | ||
118 | arcs_cmdline[0] = '\0'; | ||
119 | |||
120 | for (i = 1; i < argc; i++) { | ||
121 | ptr = (char *)arg64((unsigned long)arg, i); | ||
122 | if ((strlen(arcs_cmdline) + strlen(ptr) + 1) >= | ||
123 | sizeof(arcs_cmdline)) | ||
124 | break; | ||
125 | strcat(arcs_cmdline, ptr); | ||
126 | strcat(arcs_cmdline, " "); | ||
127 | } | ||
128 | |||
129 | i = 0; | ||
130 | while (1) { | ||
131 | ptr = (char *)arg64((unsigned long)env, i); | ||
132 | if (! ptr) | ||
133 | break; | ||
134 | |||
135 | if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) { | ||
136 | marvell_base = simple_strtol(ptr + strlen("gtbase="), | ||
137 | NULL, 16); | ||
138 | |||
139 | if ((marvell_base & 0xffffffff00000000) == 0) | ||
140 | marvell_base |= 0xffffffff00000000; | ||
141 | |||
142 | printk("marvell_base set to 0x%016lx\n", marvell_base); | ||
143 | } | ||
144 | if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) { | ||
145 | cpu_clock = simple_strtol(ptr + strlen("cpuclock="), | ||
146 | NULL, 10); | ||
147 | printk("cpu_clock set to %d\n", cpu_clock); | ||
148 | } | ||
149 | i++; | ||
150 | } | ||
151 | printk("arcs_cmdline: %s\n", arcs_cmdline); | ||
152 | |||
153 | #else /* CONFIG_64BIT */ | ||
154 | /* save the PROM vectors for debugging use */ | ||
155 | debug_vectors = cv; | ||
156 | |||
157 | /* arg[0] is "g", the rest is boot parameters */ | ||
158 | arcs_cmdline[0] = '\0'; | ||
159 | for (i = 1; i < argc; i++) { | ||
160 | if (strlen(arcs_cmdline) + strlen(arg[i] + 1) | ||
161 | >= sizeof(arcs_cmdline)) | ||
162 | break; | ||
163 | strcat(arcs_cmdline, arg[i]); | ||
164 | strcat(arcs_cmdline, " "); | ||
165 | } | ||
166 | |||
167 | while (*env) { | ||
168 | if (strncmp("gtbase", *env, strlen("gtbase")) == 0) { | ||
169 | marvell_base = simple_strtol(*env + strlen("gtbase="), | ||
170 | NULL, 16); | ||
171 | } | ||
172 | if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) { | ||
173 | cpu_clock = simple_strtol(*env + strlen("cpuclock="), | ||
174 | NULL, 10); | ||
175 | } | ||
176 | env++; | ||
177 | } | ||
178 | #endif /* CONFIG_64BIT */ | ||
179 | mips_machgroup = MACH_GROUP_MOMENCO; | ||
180 | mips_machtype = MACH_MOMENCO_JAGUAR_ATX; | ||
181 | } | ||
182 | |||
183 | void __init prom_free_prom_memory(void) | ||
184 | { | ||
185 | } | ||
186 | |||
187 | void __init prom_fixup_mem_map(unsigned long start, unsigned long end) | ||
188 | { | ||
189 | } | ||
190 | |||
191 | int prom_boot_secondary(int cpu, unsigned long sp, unsigned long gp) | ||
192 | { | ||
193 | /* Clear the semaphore */ | ||
194 | *(volatile uint32_t *)(0xbb000a68) = 0x80000000; | ||
195 | |||
196 | return 1; | ||
197 | } | ||
198 | |||
199 | void prom_init_secondary(void) | ||
200 | { | ||
201 | clear_c0_config(CONF_CM_CMASK); | ||
202 | set_c0_config(0x2); | ||
203 | |||
204 | clear_c0_status(ST0_IM); | ||
205 | set_c0_status(0x1ffff); | ||
206 | } | ||
207 | |||
208 | void prom_smp_finish(void) | ||
209 | { | ||
210 | } | ||
diff --git a/arch/mips/momentum/jaguar_atx/reset.c b/arch/mips/momentum/jaguar_atx/reset.c deleted file mode 100644 index c73b0897dc52..000000000000 --- a/arch/mips/momentum/jaguar_atx/reset.c +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | /* | ||
2 | * This program is free software; you can redistribute it and/or modify it | ||
3 | * under the terms of the GNU General Public License as published by the | ||
4 | * Free Software Foundation; either version 2 of the License, or (at your | ||
5 | * option) any later version. | ||
6 | * | ||
7 | * Copyright (C) 1997, 2001 Ralf Baechle | ||
8 | * Copyright 2001 MontaVista Software Inc. | ||
9 | * Author: jsun@mvista.com or jsun@junsun.net | ||
10 | * | ||
11 | * Copyright (C) 2002 Momentum Computer Inc. | ||
12 | * Author: Matthew Dharm <mdharm@momenco.com> | ||
13 | * | ||
14 | * Louis Hamilton, Red Hat, Inc. | ||
15 | * hamilton@redhat.com [MIPS64 modifications] | ||
16 | */ | ||
17 | #include <linux/sched.h> | ||
18 | #include <linux/mm.h> | ||
19 | #include <asm/io.h> | ||
20 | #include <asm/pgtable.h> | ||
21 | #include <asm/processor.h> | ||
22 | #include <asm/reboot.h> | ||
23 | #include <asm/system.h> | ||
24 | #include <linux/delay.h> | ||
25 | |||
26 | void momenco_jaguar_restart(char *command) | ||
27 | { | ||
28 | /* base address of timekeeper portion of part */ | ||
29 | #ifdef CONFIG_64BIT | ||
30 | void *nvram = (void*) 0xfffffffffc807000; | ||
31 | #else | ||
32 | void *nvram = (void*) 0xfc807000; | ||
33 | #endif | ||
34 | /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ | ||
35 | writeb(0x84, nvram + 0xff7); | ||
36 | |||
37 | /* wait for the watchdog to go off */ | ||
38 | mdelay(100+(1000/16)); | ||
39 | |||
40 | /* if the watchdog fails for some reason, let people know */ | ||
41 | printk(KERN_NOTICE "Watchdog reset failed\n"); | ||
42 | } | ||
43 | |||
44 | void momenco_jaguar_halt(void) | ||
45 | { | ||
46 | printk(KERN_NOTICE "\n** You can safely turn off the power\n"); | ||
47 | while (1) | ||
48 | __asm__(".set\tmips3\n\t" | ||
49 | "wait\n\t" | ||
50 | ".set\tmips0"); | ||
51 | } | ||
52 | |||
53 | void momenco_jaguar_power_off(void) | ||
54 | { | ||
55 | momenco_jaguar_halt(); | ||
56 | } | ||
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c deleted file mode 100644 index 5a510142b978..000000000000 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ /dev/null | |||
@@ -1,475 +0,0 @@ | |||
1 | /* | ||
2 | * BRIEF MODULE DESCRIPTION | ||
3 | * Momentum Computer Jaguar-ATX board dependent boot routines | ||
4 | * | ||
5 | * Copyright (C) 1996, 1997, 2001, 04, 06 Ralf Baechle (ralf@linux-mips.org) | ||
6 | * Copyright (C) 2000 RidgeRun, Inc. | ||
7 | * Copyright (C) 2001 Red Hat, Inc. | ||
8 | * Copyright (C) 2002 Momentum Computer | ||
9 | * | ||
10 | * Author: Matthew Dharm, Momentum Computer | ||
11 | * mdharm@momenco.com | ||
12 | * | ||
13 | * Louis Hamilton, Red Hat, Inc. | ||
14 | * hamilton@redhat.com [MIPS64 modifications] | ||
15 | * | ||
16 | * Author: RidgeRun, Inc. | ||
17 | * glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com | ||
18 | * | ||
19 | * Copyright 2001 MontaVista Software Inc. | ||
20 | * Author: jsun@mvista.com or jsun@junsun.net | ||
21 | * | ||
22 | * This program is free software; you can redistribute it and/or modify it | ||
23 | * under the terms of the GNU General Public License as published by the | ||
24 | * Free Software Foundation; either version 2 of the License, or (at your | ||
25 | * option) any later version. | ||
26 | * | ||
27 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
28 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
29 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
30 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
31 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
32 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
33 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
34 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
35 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
36 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
37 | * | ||
38 | * You should have received a copy of the GNU General Public License along | ||
39 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
40 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
41 | */ | ||
42 | #include <linux/bcd.h> | ||
43 | #include <linux/init.h> | ||
44 | #include <linux/kernel.h> | ||
45 | #include <linux/types.h> | ||
46 | #include <linux/mm.h> | ||
47 | #include <linux/bootmem.h> | ||
48 | #include <linux/module.h> | ||
49 | #include <linux/pci.h> | ||
50 | #include <linux/swap.h> | ||
51 | #include <linux/ioport.h> | ||
52 | #include <linux/pm.h> | ||
53 | #include <linux/sched.h> | ||
54 | #include <linux/interrupt.h> | ||
55 | #include <linux/timex.h> | ||
56 | #include <linux/vmalloc.h> | ||
57 | #include <linux/mv643xx.h> | ||
58 | |||
59 | #include <asm/time.h> | ||
60 | #include <asm/bootinfo.h> | ||
61 | #include <asm/page.h> | ||
62 | #include <asm/io.h> | ||
63 | #include <asm/irq.h> | ||
64 | #include <asm/processor.h> | ||
65 | #include <asm/reboot.h> | ||
66 | #include <asm/tlbflush.h> | ||
67 | |||
68 | #include "jaguar_atx_fpga.h" | ||
69 | |||
70 | extern unsigned long mv64340_sram_base; | ||
71 | unsigned long cpu_clock; | ||
72 | |||
73 | /* These functions are used for rebooting or halting the machine*/ | ||
74 | extern void momenco_jaguar_restart(char *command); | ||
75 | extern void momenco_jaguar_halt(void); | ||
76 | extern void momenco_jaguar_power_off(void); | ||
77 | |||
78 | void momenco_time_init(void); | ||
79 | |||
80 | static char reset_reason; | ||
81 | |||
82 | static inline unsigned long ENTRYLO(unsigned long paddr) | ||
83 | { | ||
84 | return ((paddr & PAGE_MASK) | | ||
85 | (_PAGE_PRESENT | __READABLE | __WRITEABLE | _PAGE_GLOBAL | | ||
86 | _CACHE_UNCACHED)) >> 6; | ||
87 | } | ||
88 | |||
89 | void __init bus_error_init(void) { /* nothing */ } | ||
90 | |||
91 | /* | ||
92 | * Load a few TLB entries for the MV64340 and perhiperals. The MV64340 is going | ||
93 | * to be hit on every IRQ anyway - there's absolutely no point in letting it be | ||
94 | * a random TLB entry, as it'll just cause needless churning of the TLB. And we | ||
95 | * use the other half for the serial port, which is just a PITA otherwise :) | ||
96 | * | ||
97 | * Device Physical Virtual | ||
98 | * MV64340 Internal Regs 0xf4000000 0xf4000000 | ||
99 | * Ocelot-C[S] PLD (CS0) 0xfc000000 0xfc000000 | ||
100 | * NVRAM (CS1) 0xfc800000 0xfc800000 | ||
101 | * UARTs (CS2) 0xfd000000 0xfd000000 | ||
102 | * Internal SRAM 0xfe000000 0xfe000000 | ||
103 | * M-Systems DOC (CS3) 0xff000000 0xff000000 | ||
104 | */ | ||
105 | |||
106 | static __init void wire_stupidity_into_tlb(void) | ||
107 | { | ||
108 | #ifdef CONFIG_32BIT | ||
109 | write_c0_wired(0); | ||
110 | local_flush_tlb_all(); | ||
111 | |||
112 | /* marvell and extra space */ | ||
113 | add_wired_entry(ENTRYLO(0xf4000000), ENTRYLO(0xf4010000), | ||
114 | 0xf4000000UL, PM_64K); | ||
115 | /* fpga, rtc, and uart */ | ||
116 | add_wired_entry(ENTRYLO(0xfc000000), ENTRYLO(0xfd000000), | ||
117 | 0xfc000000UL, PM_16M); | ||
118 | // /* m-sys and internal SRAM */ | ||
119 | // add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), | ||
120 | // 0xfe000000UL, PM_16M); | ||
121 | |||
122 | marvell_base = 0xf4000000; | ||
123 | //mv64340_sram_base = 0xfe000000; /* Currently unused */ | ||
124 | #endif | ||
125 | } | ||
126 | |||
127 | unsigned long marvell_base = 0xf4000000L; | ||
128 | unsigned long ja_fpga_base = JAGUAR_ATX_CS0_ADDR; | ||
129 | unsigned long uart_base = 0xfd000000L; | ||
130 | static unsigned char *rtc_base = (unsigned char*) 0xfc800000L; | ||
131 | |||
132 | EXPORT_SYMBOL(marvell_base); | ||
133 | |||
134 | static __init int per_cpu_mappings(void) | ||
135 | { | ||
136 | marvell_base = (unsigned long) ioremap(0xf4000000, 0x10000); | ||
137 | ja_fpga_base = (unsigned long) ioremap(JAGUAR_ATX_CS0_ADDR, 0x1000); | ||
138 | uart_base = (unsigned long) ioremap(0xfd000000UL, 0x1000); | ||
139 | rtc_base = ioremap(0xfc000000UL, 0x8000); | ||
140 | // ioremap(0xfe000000, 32 << 20); | ||
141 | write_c0_wired(0); | ||
142 | local_flush_tlb_all(); | ||
143 | ja_setup_console(); | ||
144 | |||
145 | return 0; | ||
146 | } | ||
147 | arch_initcall(per_cpu_mappings); | ||
148 | |||
149 | unsigned long m48t37y_get_time(void) | ||
150 | { | ||
151 | unsigned int year, month, day, hour, min, sec; | ||
152 | unsigned long flags; | ||
153 | |||
154 | spin_lock_irqsave(&rtc_lock, flags); | ||
155 | /* stop the update */ | ||
156 | rtc_base[0x7ff8] = 0x40; | ||
157 | |||
158 | year = BCD2BIN(rtc_base[0x7fff]); | ||
159 | year += BCD2BIN(rtc_base[0x7ff1]) * 100; | ||
160 | |||
161 | month = BCD2BIN(rtc_base[0x7ffe]); | ||
162 | |||
163 | day = BCD2BIN(rtc_base[0x7ffd]); | ||
164 | |||
165 | hour = BCD2BIN(rtc_base[0x7ffb]); | ||
166 | min = BCD2BIN(rtc_base[0x7ffa]); | ||
167 | sec = BCD2BIN(rtc_base[0x7ff9]); | ||
168 | |||
169 | /* start the update */ | ||
170 | rtc_base[0x7ff8] = 0x00; | ||
171 | spin_unlock_irqrestore(&rtc_lock, flags); | ||
172 | |||
173 | return mktime(year, month, day, hour, min, sec); | ||
174 | } | ||
175 | |||
176 | int m48t37y_set_time(unsigned long sec) | ||
177 | { | ||
178 | struct rtc_time tm; | ||
179 | unsigned long flags; | ||
180 | |||
181 | /* convert to a more useful format -- note months count from 0 */ | ||
182 | to_tm(sec, &tm); | ||
183 | tm.tm_mon += 1; | ||
184 | |||
185 | spin_lock_irqsave(&rtc_lock, flags); | ||
186 | /* enable writing */ | ||
187 | rtc_base[0x7ff8] = 0x80; | ||
188 | |||
189 | /* year */ | ||
190 | rtc_base[0x7fff] = BIN2BCD(tm.tm_year % 100); | ||
191 | rtc_base[0x7ff1] = BIN2BCD(tm.tm_year / 100); | ||
192 | |||
193 | /* month */ | ||
194 | rtc_base[0x7ffe] = BIN2BCD(tm.tm_mon); | ||
195 | |||
196 | /* day */ | ||
197 | rtc_base[0x7ffd] = BIN2BCD(tm.tm_mday); | ||
198 | |||
199 | /* hour/min/sec */ | ||
200 | rtc_base[0x7ffb] = BIN2BCD(tm.tm_hour); | ||
201 | rtc_base[0x7ffa] = BIN2BCD(tm.tm_min); | ||
202 | rtc_base[0x7ff9] = BIN2BCD(tm.tm_sec); | ||
203 | |||
204 | /* day of week -- not really used, but let's keep it up-to-date */ | ||
205 | rtc_base[0x7ffc] = BIN2BCD(tm.tm_wday + 1); | ||
206 | |||
207 | /* disable writing */ | ||
208 | rtc_base[0x7ff8] = 0x00; | ||
209 | spin_unlock_irqrestore(&rtc_lock, flags); | ||
210 | |||
211 | return 0; | ||
212 | } | ||
213 | |||
214 | void __init plat_timer_setup(struct irqaction *irq) | ||
215 | { | ||
216 | setup_irq(8, irq); | ||
217 | } | ||
218 | |||
219 | /* | ||
220 | * Ugly but the least of all evils. TLB initialization did flush the TLB so | ||
221 | * We need to setup mappings again before we can touch the RTC. | ||
222 | */ | ||
223 | void momenco_time_init(void) | ||
224 | { | ||
225 | wire_stupidity_into_tlb(); | ||
226 | |||
227 | mips_hpt_frequency = cpu_clock / 2; | ||
228 | |||
229 | rtc_mips_get_time = m48t37y_get_time; | ||
230 | rtc_mips_set_time = m48t37y_set_time; | ||
231 | } | ||
232 | |||
233 | static struct resource mv_pci_io_mem0_resource = { | ||
234 | .name = "MV64340 PCI0 IO MEM", | ||
235 | .flags = IORESOURCE_IO | ||
236 | }; | ||
237 | |||
238 | static struct resource mv_pci_mem0_resource = { | ||
239 | .name = "MV64340 PCI0 MEM", | ||
240 | .flags = IORESOURCE_MEM | ||
241 | }; | ||
242 | |||
243 | static struct mv_pci_controller mv_bus0_controller = { | ||
244 | .pcic = { | ||
245 | .pci_ops = &mv_pci_ops, | ||
246 | .mem_resource = &mv_pci_mem0_resource, | ||
247 | .io_resource = &mv_pci_io_mem0_resource, | ||
248 | }, | ||
249 | .config_addr = MV64340_PCI_0_CONFIG_ADDR, | ||
250 | .config_vreg = MV64340_PCI_0_CONFIG_DATA_VIRTUAL_REG, | ||
251 | }; | ||
252 | |||
253 | static uint32_t mv_io_base, mv_io_size; | ||
254 | |||
255 | static void ja_pci0_init(void) | ||
256 | { | ||
257 | uint32_t mem0_base, mem0_size; | ||
258 | uint32_t io_base, io_size; | ||
259 | |||
260 | io_base = MV_READ(MV64340_PCI_0_IO_BASE_ADDR) << 16; | ||
261 | io_size = (MV_READ(MV64340_PCI_0_IO_SIZE) + 1) << 16; | ||
262 | mem0_base = MV_READ(MV64340_PCI_0_MEMORY0_BASE_ADDR) << 16; | ||
263 | mem0_size = (MV_READ(MV64340_PCI_0_MEMORY0_SIZE) + 1) << 16; | ||
264 | |||
265 | mv_pci_io_mem0_resource.start = 0; | ||
266 | mv_pci_io_mem0_resource.end = io_size - 1; | ||
267 | mv_pci_mem0_resource.start = mem0_base; | ||
268 | mv_pci_mem0_resource.end = mem0_base + mem0_size - 1; | ||
269 | mv_bus0_controller.pcic.mem_offset = mem0_base; | ||
270 | mv_bus0_controller.pcic.io_offset = 0; | ||
271 | |||
272 | ioport_resource.end = io_size - 1; | ||
273 | |||
274 | register_pci_controller(&mv_bus0_controller.pcic); | ||
275 | |||
276 | mv_io_base = io_base; | ||
277 | mv_io_size = io_size; | ||
278 | } | ||
279 | |||
280 | static struct resource mv_pci_io_mem1_resource = { | ||
281 | .name = "MV64340 PCI1 IO MEM", | ||
282 | .flags = IORESOURCE_IO | ||
283 | }; | ||
284 | |||
285 | static struct resource mv_pci_mem1_resource = { | ||
286 | .name = "MV64340 PCI1 MEM", | ||
287 | .flags = IORESOURCE_MEM | ||
288 | }; | ||
289 | |||
290 | static struct mv_pci_controller mv_bus1_controller = { | ||
291 | .pcic = { | ||
292 | .pci_ops = &mv_pci_ops, | ||
293 | .mem_resource = &mv_pci_mem1_resource, | ||
294 | .io_resource = &mv_pci_io_mem1_resource, | ||
295 | }, | ||
296 | .config_addr = MV64340_PCI_1_CONFIG_ADDR, | ||
297 | .config_vreg = MV64340_PCI_1_CONFIG_DATA_VIRTUAL_REG, | ||
298 | }; | ||
299 | |||
300 | static __init void ja_pci1_init(void) | ||
301 | { | ||
302 | uint32_t mem0_base, mem0_size; | ||
303 | uint32_t io_base, io_size; | ||
304 | |||
305 | io_base = MV_READ(MV64340_PCI_1_IO_BASE_ADDR) << 16; | ||
306 | io_size = (MV_READ(MV64340_PCI_1_IO_SIZE) + 1) << 16; | ||
307 | mem0_base = MV_READ(MV64340_PCI_1_MEMORY0_BASE_ADDR) << 16; | ||
308 | mem0_size = (MV_READ(MV64340_PCI_1_MEMORY0_SIZE) + 1) << 16; | ||
309 | |||
310 | /* | ||
311 | * Here we assume the I/O window of second bus to be contiguous with | ||
312 | * the first. A gap is no problem but would waste address space for | ||
313 | * remapping the port space. | ||
314 | */ | ||
315 | mv_pci_io_mem1_resource.start = mv_io_size; | ||
316 | mv_pci_io_mem1_resource.end = mv_io_size + io_size - 1; | ||
317 | mv_pci_mem1_resource.start = mem0_base; | ||
318 | mv_pci_mem1_resource.end = mem0_base + mem0_size - 1; | ||
319 | mv_bus1_controller.pcic.mem_offset = mem0_base; | ||
320 | mv_bus1_controller.pcic.io_offset = 0; | ||
321 | |||
322 | ioport_resource.end = io_base + io_size -mv_io_base - 1; | ||
323 | |||
324 | register_pci_controller(&mv_bus1_controller.pcic); | ||
325 | |||
326 | mv_io_size = io_base + io_size - mv_io_base; | ||
327 | } | ||
328 | |||
329 | static __init int __init ja_pci_init(void) | ||
330 | { | ||
331 | unsigned long io_v_base; | ||
332 | uint32_t enable; | ||
333 | |||
334 | enable = ~MV_READ(MV64340_BASE_ADDR_ENABLE); | ||
335 | |||
336 | /* | ||
337 | * We require at least one enabled I/O or PCI memory window or we | ||
338 | * will ignore this PCI bus. We ignore PCI windows 1, 2 and 3. | ||
339 | */ | ||
340 | if (enable & (0x01 << 9) || enable & (0x01 << 10)) | ||
341 | ja_pci0_init(); | ||
342 | |||
343 | if (enable & (0x01 << 14) || enable & (0x01 << 15)) | ||
344 | ja_pci1_init(); | ||
345 | |||
346 | if (mv_io_size) { | ||
347 | io_v_base = (unsigned long) ioremap(mv_io_base, mv_io_size); | ||
348 | if (!io_v_base) | ||
349 | panic("Could not ioremap I/O port range"); | ||
350 | |||
351 | set_io_port_base(io_v_base); | ||
352 | } | ||
353 | |||
354 | return 0; | ||
355 | } | ||
356 | |||
357 | arch_initcall(ja_pci_init); | ||
358 | |||
359 | void __init plat_mem_setup(void) | ||
360 | { | ||
361 | unsigned int tmpword; | ||
362 | |||
363 | board_time_init = momenco_time_init; | ||
364 | |||
365 | _machine_restart = momenco_jaguar_restart; | ||
366 | _machine_halt = momenco_jaguar_halt; | ||
367 | pm_power_off = momenco_jaguar_power_off; | ||
368 | |||
369 | /* | ||
370 | * initrd_start = (unsigned long)jaguar_initrd_start; | ||
371 | * initrd_end = (unsigned long)jaguar_initrd_start + (ulong)jaguar_initrd_size; | ||
372 | * initrd_below_start_ok = 1; | ||
373 | */ | ||
374 | |||
375 | wire_stupidity_into_tlb(); | ||
376 | |||
377 | /* | ||
378 | * shut down ethernet ports, just to be sure our memory doesn't get | ||
379 | * corrupted by random ethernet traffic. | ||
380 | */ | ||
381 | MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0), 0xff << 8); | ||
382 | MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1), 0xff << 8); | ||
383 | MV_WRITE(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(2), 0xff << 8); | ||
384 | MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0), 0xff << 8); | ||
385 | MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1), 0xff << 8); | ||
386 | MV_WRITE(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(2), 0xff << 8); | ||
387 | while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(0)) & 0xff); | ||
388 | while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(1)) & 0xff); | ||
389 | while (MV_READ(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(2)) & 0xff); | ||
390 | while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(0)) & 0xff); | ||
391 | while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(1)) & 0xff); | ||
392 | while (MV_READ(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(2)) & 0xff); | ||
393 | MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0), | ||
394 | MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(0)) & ~1); | ||
395 | MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1), | ||
396 | MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(1)) & ~1); | ||
397 | MV_WRITE(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(2), | ||
398 | MV_READ(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(2)) & ~1); | ||
399 | |||
400 | /* Turn off the Bit-Error LED */ | ||
401 | JAGUAR_FPGA_WRITE(0x80, CLR); | ||
402 | |||
403 | tmpword = JAGUAR_FPGA_READ(BOARDREV); | ||
404 | if (tmpword < 26) | ||
405 | printk("Momentum Jaguar-ATX: Board Assembly Rev. %c\n", | ||
406 | 'A'+tmpword); | ||
407 | else | ||
408 | printk("Momentum Jaguar-ATX: Board Assembly Revision #0x%x\n", | ||
409 | tmpword); | ||
410 | |||
411 | tmpword = JAGUAR_FPGA_READ(FPGA_REV); | ||
412 | printk("FPGA Rev: %d.%d\n", tmpword>>4, tmpword&15); | ||
413 | tmpword = JAGUAR_FPGA_READ(RESET_STATUS); | ||
414 | printk("Reset reason: 0x%x\n", tmpword); | ||
415 | switch (tmpword) { | ||
416 | case 0x1: | ||
417 | printk(" - Power-up reset\n"); | ||
418 | break; | ||
419 | case 0x2: | ||
420 | printk(" - Push-button reset\n"); | ||
421 | break; | ||
422 | case 0x8: | ||
423 | printk(" - Watchdog reset\n"); | ||
424 | break; | ||
425 | case 0x10: | ||
426 | printk(" - JTAG reset\n"); | ||
427 | break; | ||
428 | default: | ||
429 | printk(" - Unknown reset cause\n"); | ||
430 | } | ||
431 | reset_reason = tmpword; | ||
432 | JAGUAR_FPGA_WRITE(0xff, RESET_STATUS); | ||
433 | |||
434 | tmpword = JAGUAR_FPGA_READ(BOARD_STATUS); | ||
435 | printk("Board Status register: 0x%02x\n", tmpword); | ||
436 | printk(" - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent"); | ||
437 | printk(" - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent"); | ||
438 | |||
439 | /* 256MiB of RM9000x2 DDR */ | ||
440 | // add_memory_region(0x0, 0x100<<20, BOOT_MEM_RAM); | ||
441 | |||
442 | /* 128MiB of MV-64340 DDR */ | ||
443 | // add_memory_region(0x100<<20, 0x80<<20, BOOT_MEM_RAM); | ||
444 | |||
445 | /* XXX Memory configuration should be picked up from PMON2k */ | ||
446 | #ifdef CONFIG_JAGUAR_DMALOW | ||
447 | printk("Jaguar ATX DMA-low mode set\n"); | ||
448 | add_memory_region(0x00000000, 0x08000000, BOOT_MEM_RAM); | ||
449 | add_memory_region(0x08000000, 0x10000000, BOOT_MEM_RAM); | ||
450 | #else | ||
451 | /* 128MiB of MV-64340 DDR RAM */ | ||
452 | printk("Jaguar ATX DMA-low mode is not set\n"); | ||
453 | add_memory_region(0x100<<20, 0x80<<20, BOOT_MEM_RAM); | ||
454 | #endif | ||
455 | |||
456 | #ifdef GEMDEBUG_TRACEBUFFER | ||
457 | { | ||
458 | unsigned int tbControl; | ||
459 | tbControl = | ||
460 | 0 << 26 | /* post trigger delay 0 */ | ||
461 | 0x2 << 16 | /* sequential trace mode */ | ||
462 | // 0x0 << 16 | /* non-sequential trace mode */ | ||
463 | // 0xf << 4 | /* watchpoints disabled */ | ||
464 | 2 << 2 | /* armed */ | ||
465 | 2 ; /* interrupt disabled */ | ||
466 | printk ("setting tbControl = %08lx\n", tbControl); | ||
467 | write_32bit_cp0_set1_register($22, tbControl); | ||
468 | __asm__ __volatile__(".set noreorder\n\t" \ | ||
469 | "nop; nop; nop; nop; nop; nop;\n\t" \ | ||
470 | "nop; nop; nop; nop; nop; nop;\n\t" \ | ||
471 | ".set reorder\n\t"); | ||
472 | |||
473 | } | ||
474 | #endif | ||
475 | } | ||
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index 30a1c79c6f5f..aba3dbf47eda 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile | |||
@@ -30,7 +30,6 @@ obj-$(CONFIG_SOC_AU1500) += fixup-au1000.o ops-au1000.o | |||
30 | obj-$(CONFIG_SOC_AU1550) += fixup-au1000.o ops-au1000.o | 30 | obj-$(CONFIG_SOC_AU1550) += fixup-au1000.o ops-au1000.o |
31 | obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o | 31 | obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o |
32 | obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o | 32 | obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o |
33 | obj-$(CONFIG_MOMENCO_JAGUAR_ATX)+= fixup-jaguar.o | ||
34 | obj-$(CONFIG_MOMENCO_OCELOT) += fixup-ocelot.o pci-ocelot.o | 33 | obj-$(CONFIG_MOMENCO_OCELOT) += fixup-ocelot.o pci-ocelot.o |
35 | obj-$(CONFIG_MOMENCO_OCELOT_3) += fixup-ocelot3.o | 34 | obj-$(CONFIG_MOMENCO_OCELOT_3) += fixup-ocelot3.o |
36 | obj-$(CONFIG_MOMENCO_OCELOT_C) += fixup-ocelot-c.o pci-ocelot-c.o | 35 | obj-$(CONFIG_MOMENCO_OCELOT_C) += fixup-ocelot-c.o pci-ocelot-c.o |
diff --git a/arch/mips/pci/fixup-jaguar.c b/arch/mips/pci/fixup-jaguar.c deleted file mode 100644 index 6c5e1d47179c..000000000000 --- a/arch/mips/pci/fixup-jaguar.c +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Marvell MV64340 interrupt fixup code. | ||
7 | * | ||
8 | * Marvell wants an NDA for their docs so this was written without | ||
9 | * documentation. You've been warned. | ||
10 | * | ||
11 | * Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org) | ||
12 | */ | ||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/pci.h> | ||
16 | |||
17 | #include <asm/mipsregs.h> | ||
18 | |||
19 | /* | ||
20 | * WARNING: Example of how _NOT_ to do it. | ||
21 | */ | ||
22 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
23 | { | ||
24 | int bus = dev->bus->number; | ||
25 | |||
26 | if (bus == 0 && slot == 1) | ||
27 | return 3; /* PCI-X A */ | ||
28 | if (bus == 0 && slot == 2) | ||
29 | return 4; /* PCI-X B */ | ||
30 | if (bus == 1 && slot == 1) | ||
31 | return 5; /* PCI A */ | ||
32 | if (bus == 1 && slot == 2) | ||
33 | return 6; /* PCI B */ | ||
34 | |||
35 | return 0; | ||
36 | panic("Whooops in pcibios_map_irq"); | ||
37 | } | ||
38 | |||
39 | /* Do platform specific device initialization at pci_enable_device() time */ | ||
40 | int pcibios_plat_dev_init(struct pci_dev *dev) | ||
41 | { | ||
42 | return 0; | ||
43 | } | ||
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index 198ecc08ab40..b0c329783ac5 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h | |||
@@ -121,7 +121,7 @@ | |||
121 | #define MACH_MOMENCO_OCELOT 0 | 121 | #define MACH_MOMENCO_OCELOT 0 |
122 | #define MACH_MOMENCO_OCELOT_G 1 /* no more supported (may 2007) */ | 122 | #define MACH_MOMENCO_OCELOT_G 1 /* no more supported (may 2007) */ |
123 | #define MACH_MOMENCO_OCELOT_C 2 | 123 | #define MACH_MOMENCO_OCELOT_C 2 |
124 | #define MACH_MOMENCO_JAGUAR_ATX 3 | 124 | #define MACH_MOMENCO_JAGUAR_ATX 3 /* no more supported (may 2007) */ |
125 | #define MACH_MOMENCO_OCELOT_3 4 | 125 | #define MACH_MOMENCO_OCELOT_3 4 |
126 | 126 | ||
127 | /* | 127 | /* |
diff --git a/include/asm-mips/mach-ja/cpu-feature-overrides.h b/include/asm-mips/mach-ja/cpu-feature-overrides.h deleted file mode 100644 index 84b6dead0e8a..000000000000 --- a/include/asm-mips/mach-ja/cpu-feature-overrides.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2003, 2004 Ralf Baechle | ||
7 | */ | ||
8 | #ifndef __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H | ||
9 | #define __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H | ||
10 | |||
11 | /* | ||
12 | * Momentum Jaguar ATX always has the RM9000 processor. | ||
13 | */ | ||
14 | #define cpu_has_watch 1 | ||
15 | #define cpu_has_mips16 0 | ||
16 | #define cpu_has_divec 0 | ||
17 | #define cpu_has_vce 0 | ||
18 | #define cpu_has_cache_cdex_p 0 | ||
19 | #define cpu_has_cache_cdex_s 0 | ||
20 | #define cpu_has_prefetch 1 | ||
21 | #define cpu_has_mcheck 0 | ||
22 | #define cpu_has_ejtag 0 | ||
23 | |||
24 | #define cpu_has_llsc 1 | ||
25 | #define cpu_has_vtag_icache 0 | ||
26 | #define cpu_has_dc_aliases 0 | ||
27 | #define cpu_has_ic_fills_f_dc 0 | ||
28 | #define cpu_has_dsp 0 | ||
29 | #define cpu_icache_snoops_remote_store 0 | ||
30 | |||
31 | #define cpu_has_nofpuex 0 | ||
32 | #define cpu_has_64bits 1 | ||
33 | |||
34 | #define cpu_has_inclusive_pcaches 0 | ||
35 | |||
36 | #define cpu_dcache_line_size() 32 | ||
37 | #define cpu_icache_line_size() 32 | ||
38 | #define cpu_scache_line_size() 32 | ||
39 | |||
40 | #define cpu_has_mips32r1 0 | ||
41 | #define cpu_has_mips32r2 0 | ||
42 | #define cpu_has_mips64r1 0 | ||
43 | #define cpu_has_mips64r2 0 | ||
44 | |||
45 | #endif /* __ASM_MACH_JA_CPU_FEATURE_OVERRIDES_H */ | ||
diff --git a/include/asm-mips/mach-ja/spaces.h b/include/asm-mips/mach-ja/spaces.h deleted file mode 100644 index 8466a0e69c79..000000000000 --- a/include/asm-mips/mach-ja/spaces.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 1994 - 1999, 2000, 03, 04 Ralf Baechle | ||
7 | * Copyright (C) 2000, 2002 Maciej W. Rozycki | ||
8 | * Copyright (C) 1990, 1999, 2000 Silicon Graphics, Inc. | ||
9 | */ | ||
10 | #ifndef __ASM_MACH_JA_SPACES_H | ||
11 | #define __ASM_MACH_JA_SPACES_H | ||
12 | |||
13 | /* | ||
14 | * Memory above this physical address will be considered highmem. | ||
15 | */ | ||
16 | #define HIGHMEM_START 0x08000000UL | ||
17 | |||
18 | #include_next <spaces.h> | ||
19 | |||
20 | #endif /* __ASM_MACH_JA_SPACES_H */ | ||
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h index 5e0da6e2d698..ce51213d84f9 100644 --- a/include/asm-mips/serial.h +++ b/include/asm-mips/serial.h | |||
@@ -81,25 +81,6 @@ | |||
81 | #define STD_SERIAL_PORT_DEFNS | 81 | #define STD_SERIAL_PORT_DEFNS |
82 | #endif /* CONFIG_HAVE_STD_PC_SERIAL_PORTS */ | 82 | #endif /* CONFIG_HAVE_STD_PC_SERIAL_PORTS */ |
83 | 83 | ||
84 | #ifdef CONFIG_MOMENCO_JAGUAR_ATX | ||
85 | /* Ordinary NS16552 duart with a 20MHz crystal. */ | ||
86 | #define JAGUAR_ATX_UART_CLK 20000000 | ||
87 | #define JAGUAR_ATX_BASE_BAUD (JAGUAR_ATX_UART_CLK / 16) | ||
88 | |||
89 | #define JAGUAR_ATX_SERIAL1_IRQ 6 | ||
90 | #define JAGUAR_ATX_SERIAL1_BASE 0xfd000023L | ||
91 | |||
92 | #define _JAGUAR_ATX_SERIAL_INIT(int, base) \ | ||
93 | { .baud_base = JAGUAR_ATX_BASE_BAUD, irq: int, \ | ||
94 | .flags = (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \ | ||
95 | .iomem_base = (u8 *) base, iomem_reg_shift: 2, \ | ||
96 | io_type: SERIAL_IO_MEM } | ||
97 | #define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS \ | ||
98 | _JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE) | ||
99 | #else | ||
100 | #define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS | ||
101 | #endif | ||
102 | |||
103 | #ifdef CONFIG_MOMENCO_OCELOT_3 | 84 | #ifdef CONFIG_MOMENCO_OCELOT_3 |
104 | #define OCELOT_3_BASE_BAUD ( 20000000 / 16 ) | 85 | #define OCELOT_3_BASE_BAUD ( 20000000 / 16 ) |
105 | #define OCELOT_3_SERIAL_IRQ 6 | 86 | #define OCELOT_3_SERIAL_IRQ 6 |