diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:15:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:15:31 -0400 |
commit | 4496d937a518fde0d0e1980e4ab470cedb4b50cd (patch) | |
tree | a02d57e13b44483417973a306f9fd23743959375 /arch/m68k | |
parent | 8e9d2089723d08d51e66c5eea49253d76e27941e (diff) | |
parent | 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: irq_node.handler() should return irqreturn_t
m68k: section mismatch fixes: Atari SCSI
m68k: section mismatch fixes: DMAsound for Atari
MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
m68k: mac - Add SWIM floppy support
m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
m68k: Add install target
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/Makefile | 3 | ||||
-rw-r--r-- | arch/m68k/include/asm/irq_mm.h | 3 | ||||
-rw-r--r-- | arch/m68k/include/asm/macintosh.h | 7 | ||||
-rw-r--r-- | arch/m68k/install.sh | 52 | ||||
-rw-r--r-- | arch/m68k/mac/config.c | 207 | ||||
-rw-r--r-- | arch/m68k/mac/via.c | 9 |
6 files changed, 226 insertions, 55 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 8133dbc44964..570d85c3f97f 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile | |||
@@ -117,3 +117,6 @@ endif | |||
117 | 117 | ||
118 | archclean: | 118 | archclean: |
119 | rm -f vmlinux.gz vmlinux.bz2 | 119 | rm -f vmlinux.gz vmlinux.bz2 |
120 | |||
121 | install: | ||
122 | sh $(srctree)/arch/m68k/install.sh $(KERNELRELEASE) vmlinux.gz System.map "$(INSTALL_PATH)" | ||
diff --git a/arch/m68k/include/asm/irq_mm.h b/arch/m68k/include/asm/irq_mm.h index 226bfc0f21b1..0cab42cad79e 100644 --- a/arch/m68k/include/asm/irq_mm.h +++ b/arch/m68k/include/asm/irq_mm.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/linkage.h> | 4 | #include <linux/linkage.h> |
5 | #include <linux/hardirq.h> | 5 | #include <linux/hardirq.h> |
6 | #include <linux/irqreturn.h> | ||
6 | #include <linux/spinlock_types.h> | 7 | #include <linux/spinlock_types.h> |
7 | 8 | ||
8 | /* | 9 | /* |
@@ -80,7 +81,7 @@ struct pt_regs; | |||
80 | * interrupt source (if it supports chaining). | 81 | * interrupt source (if it supports chaining). |
81 | */ | 82 | */ |
82 | typedef struct irq_node { | 83 | typedef struct irq_node { |
83 | int (*handler)(int, void *); | 84 | irqreturn_t (*handler)(int, void *); |
84 | void *dev_id; | 85 | void *dev_id; |
85 | struct irq_node *next; | 86 | struct irq_node *next; |
86 | unsigned long flags; | 87 | unsigned long flags; |
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h index 05309f7e3d06..50db3591ca15 100644 --- a/arch/m68k/include/asm/macintosh.h +++ b/arch/m68k/include/asm/macintosh.h | |||
@@ -34,6 +34,7 @@ struct mac_model | |||
34 | char scc_type; | 34 | char scc_type; |
35 | char ether_type; | 35 | char ether_type; |
36 | char nubus_type; | 36 | char nubus_type; |
37 | char floppy_type; | ||
37 | }; | 38 | }; |
38 | 39 | ||
39 | #define MAC_ADB_NONE 0 | 40 | #define MAC_ADB_NONE 0 |
@@ -71,6 +72,12 @@ struct mac_model | |||
71 | #define MAC_NO_NUBUS 0 | 72 | #define MAC_NO_NUBUS 0 |
72 | #define MAC_NUBUS 1 | 73 | #define MAC_NUBUS 1 |
73 | 74 | ||
75 | #define MAC_FLOPPY_IWM 0 | ||
76 | #define MAC_FLOPPY_SWIM_ADDR1 1 | ||
77 | #define MAC_FLOPPY_SWIM_ADDR2 2 | ||
78 | #define MAC_FLOPPY_SWIM_IOP 3 | ||
79 | #define MAC_FLOPPY_AV 4 | ||
80 | |||
74 | /* | 81 | /* |
75 | * Gestalt numbers | 82 | * Gestalt numbers |
76 | */ | 83 | */ |
diff --git a/arch/m68k/install.sh b/arch/m68k/install.sh new file mode 100644 index 000000000000..9c6bae6112e3 --- /dev/null +++ b/arch/m68k/install.sh | |||
@@ -0,0 +1,52 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # This file is subject to the terms and conditions of the GNU General Public | ||
4 | # License. See the file "COPYING" in the main directory of this archive | ||
5 | # for more details. | ||
6 | # | ||
7 | # Copyright (C) 1995 by Linus Torvalds | ||
8 | # | ||
9 | # Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin | ||
10 | # | ||
11 | # "make install" script for m68k architecture | ||
12 | # | ||
13 | # Arguments: | ||
14 | # $1 - kernel version | ||
15 | # $2 - kernel image file | ||
16 | # $3 - kernel map file | ||
17 | # $4 - default install path (blank if root directory) | ||
18 | # | ||
19 | |||
20 | verify () { | ||
21 | if [ ! -f "$1" ]; then | ||
22 | echo "" 1>&2 | ||
23 | echo " *** Missing file: $1" 1>&2 | ||
24 | echo ' *** You need to run "make" before "make install".' 1>&2 | ||
25 | echo "" 1>&2 | ||
26 | exit 1 | ||
27 | fi | ||
28 | } | ||
29 | |||
30 | # Make sure the files actually exist | ||
31 | verify "$2" | ||
32 | verify "$3" | ||
33 | |||
34 | # User may have a custom install script | ||
35 | |||
36 | if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi | ||
37 | if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi | ||
38 | |||
39 | # Default install - same as make zlilo | ||
40 | |||
41 | if [ -f $4/vmlinuz ]; then | ||
42 | mv $4/vmlinuz $4/vmlinuz.old | ||
43 | fi | ||
44 | |||
45 | if [ -f $4/System.map ]; then | ||
46 | mv $4/System.map $4/System.old | ||
47 | fi | ||
48 | |||
49 | cat $2 > $4/vmlinuz | ||
50 | cp $3 $4/System.map | ||
51 | |||
52 | sync | ||
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 98b6bcfb37bf..be017984a456 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -22,6 +22,7 @@ | |||
22 | /* keyb */ | 22 | /* keyb */ |
23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
24 | #include <linux/vt_kern.h> | 24 | #include <linux/vt_kern.h> |
25 | #include <linux/platform_device.h> | ||
25 | 26 | ||
26 | #define BOOTINFO_COMPAT_1_0 | 27 | #define BOOTINFO_COMPAT_1_0 |
27 | #include <asm/setup.h> | 28 | #include <asm/setup.h> |
@@ -43,6 +44,10 @@ | |||
43 | #include <asm/mac_oss.h> | 44 | #include <asm/mac_oss.h> |
44 | #include <asm/mac_psc.h> | 45 | #include <asm/mac_psc.h> |
45 | 46 | ||
47 | /* platform device info */ | ||
48 | |||
49 | #define SWIM_IO_SIZE 0x2000 /* SWIM IO resource size */ | ||
50 | |||
46 | /* Mac bootinfo struct */ | 51 | /* Mac bootinfo struct */ |
47 | 52 | ||
48 | struct mac_booter_data mac_bi_data; | 53 | struct mac_booter_data mac_bi_data; |
@@ -224,7 +229,8 @@ static struct mac_model mac_data_table[] = { | |||
224 | .via_type = MAC_VIA_II, | 229 | .via_type = MAC_VIA_II, |
225 | .scsi_type = MAC_SCSI_OLD, | 230 | .scsi_type = MAC_SCSI_OLD, |
226 | .scc_type = MAC_SCC_II, | 231 | .scc_type = MAC_SCC_II, |
227 | .nubus_type = MAC_NUBUS | 232 | .nubus_type = MAC_NUBUS, |
233 | .floppy_type = MAC_FLOPPY_IWM | ||
228 | }, | 234 | }, |
229 | 235 | ||
230 | /* | 236 | /* |
@@ -239,7 +245,8 @@ static struct mac_model mac_data_table[] = { | |||
239 | .via_type = MAC_VIA_II, | 245 | .via_type = MAC_VIA_II, |
240 | .scsi_type = MAC_SCSI_OLD, | 246 | .scsi_type = MAC_SCSI_OLD, |
241 | .scc_type = MAC_SCC_II, | 247 | .scc_type = MAC_SCC_II, |
242 | .nubus_type = MAC_NUBUS | 248 | .nubus_type = MAC_NUBUS, |
249 | .floppy_type = MAC_FLOPPY_IWM | ||
243 | }, { | 250 | }, { |
244 | .ident = MAC_MODEL_IIX, | 251 | .ident = MAC_MODEL_IIX, |
245 | .name = "IIx", | 252 | .name = "IIx", |
@@ -247,7 +254,8 @@ static struct mac_model mac_data_table[] = { | |||
247 | .via_type = MAC_VIA_II, | 254 | .via_type = MAC_VIA_II, |
248 | .scsi_type = MAC_SCSI_OLD, | 255 | .scsi_type = MAC_SCSI_OLD, |
249 | .scc_type = MAC_SCC_II, | 256 | .scc_type = MAC_SCC_II, |
250 | .nubus_type = MAC_NUBUS | 257 | .nubus_type = MAC_NUBUS, |
258 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
251 | }, { | 259 | }, { |
252 | .ident = MAC_MODEL_IICX, | 260 | .ident = MAC_MODEL_IICX, |
253 | .name = "IIcx", | 261 | .name = "IIcx", |
@@ -255,7 +263,8 @@ static struct mac_model mac_data_table[] = { | |||
255 | .via_type = MAC_VIA_II, | 263 | .via_type = MAC_VIA_II, |
256 | .scsi_type = MAC_SCSI_OLD, | 264 | .scsi_type = MAC_SCSI_OLD, |
257 | .scc_type = MAC_SCC_II, | 265 | .scc_type = MAC_SCC_II, |
258 | .nubus_type = MAC_NUBUS | 266 | .nubus_type = MAC_NUBUS, |
267 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
259 | }, { | 268 | }, { |
260 | .ident = MAC_MODEL_SE30, | 269 | .ident = MAC_MODEL_SE30, |
261 | .name = "SE/30", | 270 | .name = "SE/30", |
@@ -263,7 +272,8 @@ static struct mac_model mac_data_table[] = { | |||
263 | .via_type = MAC_VIA_II, | 272 | .via_type = MAC_VIA_II, |
264 | .scsi_type = MAC_SCSI_OLD, | 273 | .scsi_type = MAC_SCSI_OLD, |
265 | .scc_type = MAC_SCC_II, | 274 | .scc_type = MAC_SCC_II, |
266 | .nubus_type = MAC_NUBUS | 275 | .nubus_type = MAC_NUBUS, |
276 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
267 | }, | 277 | }, |
268 | 278 | ||
269 | /* | 279 | /* |
@@ -280,7 +290,8 @@ static struct mac_model mac_data_table[] = { | |||
280 | .via_type = MAC_VIA_IIci, | 290 | .via_type = MAC_VIA_IIci, |
281 | .scsi_type = MAC_SCSI_OLD, | 291 | .scsi_type = MAC_SCSI_OLD, |
282 | .scc_type = MAC_SCC_II, | 292 | .scc_type = MAC_SCC_II, |
283 | .nubus_type = MAC_NUBUS | 293 | .nubus_type = MAC_NUBUS, |
294 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
284 | }, { | 295 | }, { |
285 | .ident = MAC_MODEL_IIFX, | 296 | .ident = MAC_MODEL_IIFX, |
286 | .name = "IIfx", | 297 | .name = "IIfx", |
@@ -288,7 +299,8 @@ static struct mac_model mac_data_table[] = { | |||
288 | .via_type = MAC_VIA_IIci, | 299 | .via_type = MAC_VIA_IIci, |
289 | .scsi_type = MAC_SCSI_OLD, | 300 | .scsi_type = MAC_SCSI_OLD, |
290 | .scc_type = MAC_SCC_IOP, | 301 | .scc_type = MAC_SCC_IOP, |
291 | .nubus_type = MAC_NUBUS | 302 | .nubus_type = MAC_NUBUS, |
303 | .floppy_type = MAC_FLOPPY_SWIM_IOP | ||
292 | }, { | 304 | }, { |
293 | .ident = MAC_MODEL_IISI, | 305 | .ident = MAC_MODEL_IISI, |
294 | .name = "IIsi", | 306 | .name = "IIsi", |
@@ -296,7 +308,8 @@ static struct mac_model mac_data_table[] = { | |||
296 | .via_type = MAC_VIA_IIci, | 308 | .via_type = MAC_VIA_IIci, |
297 | .scsi_type = MAC_SCSI_OLD, | 309 | .scsi_type = MAC_SCSI_OLD, |
298 | .scc_type = MAC_SCC_II, | 310 | .scc_type = MAC_SCC_II, |
299 | .nubus_type = MAC_NUBUS | 311 | .nubus_type = MAC_NUBUS, |
312 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
300 | }, { | 313 | }, { |
301 | .ident = MAC_MODEL_IIVI, | 314 | .ident = MAC_MODEL_IIVI, |
302 | .name = "IIvi", | 315 | .name = "IIvi", |
@@ -304,7 +317,8 @@ static struct mac_model mac_data_table[] = { | |||
304 | .via_type = MAC_VIA_IIci, | 317 | .via_type = MAC_VIA_IIci, |
305 | .scsi_type = MAC_SCSI_OLD, | 318 | .scsi_type = MAC_SCSI_OLD, |
306 | .scc_type = MAC_SCC_II, | 319 | .scc_type = MAC_SCC_II, |
307 | .nubus_type = MAC_NUBUS | 320 | .nubus_type = MAC_NUBUS, |
321 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
308 | }, { | 322 | }, { |
309 | .ident = MAC_MODEL_IIVX, | 323 | .ident = MAC_MODEL_IIVX, |
310 | .name = "IIvx", | 324 | .name = "IIvx", |
@@ -312,7 +326,8 @@ static struct mac_model mac_data_table[] = { | |||
312 | .via_type = MAC_VIA_IIci, | 326 | .via_type = MAC_VIA_IIci, |
313 | .scsi_type = MAC_SCSI_OLD, | 327 | .scsi_type = MAC_SCSI_OLD, |
314 | .scc_type = MAC_SCC_II, | 328 | .scc_type = MAC_SCC_II, |
315 | .nubus_type = MAC_NUBUS | 329 | .nubus_type = MAC_NUBUS, |
330 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
316 | }, | 331 | }, |
317 | 332 | ||
318 | /* | 333 | /* |
@@ -326,7 +341,8 @@ static struct mac_model mac_data_table[] = { | |||
326 | .via_type = MAC_VIA_IIci, | 341 | .via_type = MAC_VIA_IIci, |
327 | .scsi_type = MAC_SCSI_OLD, | 342 | .scsi_type = MAC_SCSI_OLD, |
328 | .scc_type = MAC_SCC_II, | 343 | .scc_type = MAC_SCC_II, |
329 | .nubus_type = MAC_NUBUS | 344 | .nubus_type = MAC_NUBUS, |
345 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
330 | }, { | 346 | }, { |
331 | .ident = MAC_MODEL_CCL, | 347 | .ident = MAC_MODEL_CCL, |
332 | .name = "Color Classic", | 348 | .name = "Color Classic", |
@@ -334,7 +350,9 @@ static struct mac_model mac_data_table[] = { | |||
334 | .via_type = MAC_VIA_IIci, | 350 | .via_type = MAC_VIA_IIci, |
335 | .scsi_type = MAC_SCSI_OLD, | 351 | .scsi_type = MAC_SCSI_OLD, |
336 | .scc_type = MAC_SCC_II, | 352 | .scc_type = MAC_SCC_II, |
337 | .nubus_type = MAC_NUBUS}, | 353 | .nubus_type = MAC_NUBUS, |
354 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
355 | }, | ||
338 | 356 | ||
339 | /* | 357 | /* |
340 | * Some Mac LC machines. Basically the same as the IIci, ADB like IIsi | 358 | * Some Mac LC machines. Basically the same as the IIci, ADB like IIsi |
@@ -347,7 +365,8 @@ static struct mac_model mac_data_table[] = { | |||
347 | .via_type = MAC_VIA_IIci, | 365 | .via_type = MAC_VIA_IIci, |
348 | .scsi_type = MAC_SCSI_OLD, | 366 | .scsi_type = MAC_SCSI_OLD, |
349 | .scc_type = MAC_SCC_II, | 367 | .scc_type = MAC_SCC_II, |
350 | .nubus_type = MAC_NUBUS | 368 | .nubus_type = MAC_NUBUS, |
369 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
351 | }, { | 370 | }, { |
352 | .ident = MAC_MODEL_LCII, | 371 | .ident = MAC_MODEL_LCII, |
353 | .name = "LC II", | 372 | .name = "LC II", |
@@ -355,7 +374,8 @@ static struct mac_model mac_data_table[] = { | |||
355 | .via_type = MAC_VIA_IIci, | 374 | .via_type = MAC_VIA_IIci, |
356 | .scsi_type = MAC_SCSI_OLD, | 375 | .scsi_type = MAC_SCSI_OLD, |
357 | .scc_type = MAC_SCC_II, | 376 | .scc_type = MAC_SCC_II, |
358 | .nubus_type = MAC_NUBUS | 377 | .nubus_type = MAC_NUBUS, |
378 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
359 | }, { | 379 | }, { |
360 | .ident = MAC_MODEL_LCIII, | 380 | .ident = MAC_MODEL_LCIII, |
361 | .name = "LC III", | 381 | .name = "LC III", |
@@ -363,7 +383,8 @@ static struct mac_model mac_data_table[] = { | |||
363 | .via_type = MAC_VIA_IIci, | 383 | .via_type = MAC_VIA_IIci, |
364 | .scsi_type = MAC_SCSI_OLD, | 384 | .scsi_type = MAC_SCSI_OLD, |
365 | .scc_type = MAC_SCC_II, | 385 | .scc_type = MAC_SCC_II, |
366 | .nubus_type = MAC_NUBUS | 386 | .nubus_type = MAC_NUBUS, |
387 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
367 | }, | 388 | }, |
368 | 389 | ||
369 | /* | 390 | /* |
@@ -383,7 +404,8 @@ static struct mac_model mac_data_table[] = { | |||
383 | .via_type = MAC_VIA_QUADRA, | 404 | .via_type = MAC_VIA_QUADRA, |
384 | .scsi_type = MAC_SCSI_QUADRA, | 405 | .scsi_type = MAC_SCSI_QUADRA, |
385 | .scc_type = MAC_SCC_QUADRA, | 406 | .scc_type = MAC_SCC_QUADRA, |
386 | .nubus_type = MAC_NUBUS | 407 | .nubus_type = MAC_NUBUS, |
408 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
387 | }, { | 409 | }, { |
388 | .ident = MAC_MODEL_Q605_ACC, | 410 | .ident = MAC_MODEL_Q605_ACC, |
389 | .name = "Quadra 605", | 411 | .name = "Quadra 605", |
@@ -391,7 +413,8 @@ static struct mac_model mac_data_table[] = { | |||
391 | .via_type = MAC_VIA_QUADRA, | 413 | .via_type = MAC_VIA_QUADRA, |
392 | .scsi_type = MAC_SCSI_QUADRA, | 414 | .scsi_type = MAC_SCSI_QUADRA, |
393 | .scc_type = MAC_SCC_QUADRA, | 415 | .scc_type = MAC_SCC_QUADRA, |
394 | .nubus_type = MAC_NUBUS | 416 | .nubus_type = MAC_NUBUS, |
417 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
395 | }, { | 418 | }, { |
396 | .ident = MAC_MODEL_Q610, | 419 | .ident = MAC_MODEL_Q610, |
397 | .name = "Quadra 610", | 420 | .name = "Quadra 610", |
@@ -400,7 +423,8 @@ static struct mac_model mac_data_table[] = { | |||
400 | .scsi_type = MAC_SCSI_QUADRA, | 423 | .scsi_type = MAC_SCSI_QUADRA, |
401 | .scc_type = MAC_SCC_QUADRA, | 424 | .scc_type = MAC_SCC_QUADRA, |
402 | .ether_type = MAC_ETHER_SONIC, | 425 | .ether_type = MAC_ETHER_SONIC, |
403 | .nubus_type = MAC_NUBUS | 426 | .nubus_type = MAC_NUBUS, |
427 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
404 | }, { | 428 | }, { |
405 | .ident = MAC_MODEL_Q630, | 429 | .ident = MAC_MODEL_Q630, |
406 | .name = "Quadra 630", | 430 | .name = "Quadra 630", |
@@ -410,7 +434,8 @@ static struct mac_model mac_data_table[] = { | |||
410 | .ide_type = MAC_IDE_QUADRA, | 434 | .ide_type = MAC_IDE_QUADRA, |
411 | .scc_type = MAC_SCC_QUADRA, | 435 | .scc_type = MAC_SCC_QUADRA, |
412 | .ether_type = MAC_ETHER_SONIC, | 436 | .ether_type = MAC_ETHER_SONIC, |
413 | .nubus_type = MAC_NUBUS | 437 | .nubus_type = MAC_NUBUS, |
438 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
414 | }, { | 439 | }, { |
415 | .ident = MAC_MODEL_Q650, | 440 | .ident = MAC_MODEL_Q650, |
416 | .name = "Quadra 650", | 441 | .name = "Quadra 650", |
@@ -419,7 +444,8 @@ static struct mac_model mac_data_table[] = { | |||
419 | .scsi_type = MAC_SCSI_QUADRA, | 444 | .scsi_type = MAC_SCSI_QUADRA, |
420 | .scc_type = MAC_SCC_QUADRA, | 445 | .scc_type = MAC_SCC_QUADRA, |
421 | .ether_type = MAC_ETHER_SONIC, | 446 | .ether_type = MAC_ETHER_SONIC, |
422 | .nubus_type = MAC_NUBUS | 447 | .nubus_type = MAC_NUBUS, |
448 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
423 | }, | 449 | }, |
424 | /* The Q700 does have a NS Sonic */ | 450 | /* The Q700 does have a NS Sonic */ |
425 | { | 451 | { |
@@ -430,7 +456,8 @@ static struct mac_model mac_data_table[] = { | |||
430 | .scsi_type = MAC_SCSI_QUADRA2, | 456 | .scsi_type = MAC_SCSI_QUADRA2, |
431 | .scc_type = MAC_SCC_QUADRA, | 457 | .scc_type = MAC_SCC_QUADRA, |
432 | .ether_type = MAC_ETHER_SONIC, | 458 | .ether_type = MAC_ETHER_SONIC, |
433 | .nubus_type = MAC_NUBUS | 459 | .nubus_type = MAC_NUBUS, |
460 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
434 | }, { | 461 | }, { |
435 | .ident = MAC_MODEL_Q800, | 462 | .ident = MAC_MODEL_Q800, |
436 | .name = "Quadra 800", | 463 | .name = "Quadra 800", |
@@ -439,7 +466,8 @@ static struct mac_model mac_data_table[] = { | |||
439 | .scsi_type = MAC_SCSI_QUADRA, | 466 | .scsi_type = MAC_SCSI_QUADRA, |
440 | .scc_type = MAC_SCC_QUADRA, | 467 | .scc_type = MAC_SCC_QUADRA, |
441 | .ether_type = MAC_ETHER_SONIC, | 468 | .ether_type = MAC_ETHER_SONIC, |
442 | .nubus_type = MAC_NUBUS | 469 | .nubus_type = MAC_NUBUS, |
470 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
443 | }, { | 471 | }, { |
444 | .ident = MAC_MODEL_Q840, | 472 | .ident = MAC_MODEL_Q840, |
445 | .name = "Quadra 840AV", | 473 | .name = "Quadra 840AV", |
@@ -448,7 +476,8 @@ static struct mac_model mac_data_table[] = { | |||
448 | .scsi_type = MAC_SCSI_QUADRA3, | 476 | .scsi_type = MAC_SCSI_QUADRA3, |
449 | .scc_type = MAC_SCC_PSC, | 477 | .scc_type = MAC_SCC_PSC, |
450 | .ether_type = MAC_ETHER_MACE, | 478 | .ether_type = MAC_ETHER_MACE, |
451 | .nubus_type = MAC_NUBUS | 479 | .nubus_type = MAC_NUBUS, |
480 | .floppy_type = MAC_FLOPPY_AV | ||
452 | }, { | 481 | }, { |
453 | .ident = MAC_MODEL_Q900, | 482 | .ident = MAC_MODEL_Q900, |
454 | .name = "Quadra 900", | 483 | .name = "Quadra 900", |
@@ -457,7 +486,8 @@ static struct mac_model mac_data_table[] = { | |||
457 | .scsi_type = MAC_SCSI_QUADRA2, | 486 | .scsi_type = MAC_SCSI_QUADRA2, |
458 | .scc_type = MAC_SCC_IOP, | 487 | .scc_type = MAC_SCC_IOP, |
459 | .ether_type = MAC_ETHER_SONIC, | 488 | .ether_type = MAC_ETHER_SONIC, |
460 | .nubus_type = MAC_NUBUS | 489 | .nubus_type = MAC_NUBUS, |
490 | .floppy_type = MAC_FLOPPY_SWIM_IOP | ||
461 | }, { | 491 | }, { |
462 | .ident = MAC_MODEL_Q950, | 492 | .ident = MAC_MODEL_Q950, |
463 | .name = "Quadra 950", | 493 | .name = "Quadra 950", |
@@ -466,7 +496,8 @@ static struct mac_model mac_data_table[] = { | |||
466 | .scsi_type = MAC_SCSI_QUADRA2, | 496 | .scsi_type = MAC_SCSI_QUADRA2, |
467 | .scc_type = MAC_SCC_IOP, | 497 | .scc_type = MAC_SCC_IOP, |
468 | .ether_type = MAC_ETHER_SONIC, | 498 | .ether_type = MAC_ETHER_SONIC, |
469 | .nubus_type = MAC_NUBUS | 499 | .nubus_type = MAC_NUBUS, |
500 | .floppy_type = MAC_FLOPPY_SWIM_IOP | ||
470 | }, | 501 | }, |
471 | 502 | ||
472 | /* | 503 | /* |
@@ -480,7 +511,8 @@ static struct mac_model mac_data_table[] = { | |||
480 | .via_type = MAC_VIA_IIci, | 511 | .via_type = MAC_VIA_IIci, |
481 | .scsi_type = MAC_SCSI_OLD, | 512 | .scsi_type = MAC_SCSI_OLD, |
482 | .scc_type = MAC_SCC_II, | 513 | .scc_type = MAC_SCC_II, |
483 | .nubus_type = MAC_NUBUS | 514 | .nubus_type = MAC_NUBUS, |
515 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
484 | }, { | 516 | }, { |
485 | .ident = MAC_MODEL_P475, | 517 | .ident = MAC_MODEL_P475, |
486 | .name = "Performa 475", | 518 | .name = "Performa 475", |
@@ -488,7 +520,8 @@ static struct mac_model mac_data_table[] = { | |||
488 | .via_type = MAC_VIA_QUADRA, | 520 | .via_type = MAC_VIA_QUADRA, |
489 | .scsi_type = MAC_SCSI_QUADRA, | 521 | .scsi_type = MAC_SCSI_QUADRA, |
490 | .scc_type = MAC_SCC_II, | 522 | .scc_type = MAC_SCC_II, |
491 | .nubus_type = MAC_NUBUS | 523 | .nubus_type = MAC_NUBUS, |
524 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
492 | }, { | 525 | }, { |
493 | .ident = MAC_MODEL_P475F, | 526 | .ident = MAC_MODEL_P475F, |
494 | .name = "Performa 475", | 527 | .name = "Performa 475", |
@@ -496,7 +529,8 @@ static struct mac_model mac_data_table[] = { | |||
496 | .via_type = MAC_VIA_QUADRA, | 529 | .via_type = MAC_VIA_QUADRA, |
497 | .scsi_type = MAC_SCSI_QUADRA, | 530 | .scsi_type = MAC_SCSI_QUADRA, |
498 | .scc_type = MAC_SCC_II, | 531 | .scc_type = MAC_SCC_II, |
499 | .nubus_type = MAC_NUBUS | 532 | .nubus_type = MAC_NUBUS, |
533 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
500 | }, { | 534 | }, { |
501 | .ident = MAC_MODEL_P520, | 535 | .ident = MAC_MODEL_P520, |
502 | .name = "Performa 520", | 536 | .name = "Performa 520", |
@@ -504,7 +538,8 @@ static struct mac_model mac_data_table[] = { | |||
504 | .via_type = MAC_VIA_IIci, | 538 | .via_type = MAC_VIA_IIci, |
505 | .scsi_type = MAC_SCSI_OLD, | 539 | .scsi_type = MAC_SCSI_OLD, |
506 | .scc_type = MAC_SCC_II, | 540 | .scc_type = MAC_SCC_II, |
507 | .nubus_type = MAC_NUBUS | 541 | .nubus_type = MAC_NUBUS, |
542 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
508 | }, { | 543 | }, { |
509 | .ident = MAC_MODEL_P550, | 544 | .ident = MAC_MODEL_P550, |
510 | .name = "Performa 550", | 545 | .name = "Performa 550", |
@@ -512,7 +547,8 @@ static struct mac_model mac_data_table[] = { | |||
512 | .via_type = MAC_VIA_IIci, | 547 | .via_type = MAC_VIA_IIci, |
513 | .scsi_type = MAC_SCSI_OLD, | 548 | .scsi_type = MAC_SCSI_OLD, |
514 | .scc_type = MAC_SCC_II, | 549 | .scc_type = MAC_SCC_II, |
515 | .nubus_type = MAC_NUBUS | 550 | .nubus_type = MAC_NUBUS, |
551 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
516 | }, | 552 | }, |
517 | /* These have the comm slot, and therefore the possibility of SONIC ethernet */ | 553 | /* These have the comm slot, and therefore the possibility of SONIC ethernet */ |
518 | { | 554 | { |
@@ -523,7 +559,8 @@ static struct mac_model mac_data_table[] = { | |||
523 | .scsi_type = MAC_SCSI_QUADRA, | 559 | .scsi_type = MAC_SCSI_QUADRA, |
524 | .scc_type = MAC_SCC_II, | 560 | .scc_type = MAC_SCC_II, |
525 | .ether_type = MAC_ETHER_SONIC, | 561 | .ether_type = MAC_ETHER_SONIC, |
526 | .nubus_type = MAC_NUBUS | 562 | .nubus_type = MAC_NUBUS, |
563 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
527 | }, { | 564 | }, { |
528 | .ident = MAC_MODEL_P588, | 565 | .ident = MAC_MODEL_P588, |
529 | .name = "Performa 588", | 566 | .name = "Performa 588", |
@@ -533,7 +570,8 @@ static struct mac_model mac_data_table[] = { | |||
533 | .ide_type = MAC_IDE_QUADRA, | 570 | .ide_type = MAC_IDE_QUADRA, |
534 | .scc_type = MAC_SCC_II, | 571 | .scc_type = MAC_SCC_II, |
535 | .ether_type = MAC_ETHER_SONIC, | 572 | .ether_type = MAC_ETHER_SONIC, |
536 | .nubus_type = MAC_NUBUS | 573 | .nubus_type = MAC_NUBUS, |
574 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
537 | }, { | 575 | }, { |
538 | .ident = MAC_MODEL_TV, | 576 | .ident = MAC_MODEL_TV, |
539 | .name = "TV", | 577 | .name = "TV", |
@@ -541,7 +579,8 @@ static struct mac_model mac_data_table[] = { | |||
541 | .via_type = MAC_VIA_QUADRA, | 579 | .via_type = MAC_VIA_QUADRA, |
542 | .scsi_type = MAC_SCSI_OLD, | 580 | .scsi_type = MAC_SCSI_OLD, |
543 | .scc_type = MAC_SCC_II, | 581 | .scc_type = MAC_SCC_II, |
544 | .nubus_type = MAC_NUBUS | 582 | .nubus_type = MAC_NUBUS, |
583 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
545 | }, { | 584 | }, { |
546 | .ident = MAC_MODEL_P600, | 585 | .ident = MAC_MODEL_P600, |
547 | .name = "Performa 600", | 586 | .name = "Performa 600", |
@@ -549,7 +588,8 @@ static struct mac_model mac_data_table[] = { | |||
549 | .via_type = MAC_VIA_IIci, | 588 | .via_type = MAC_VIA_IIci, |
550 | .scsi_type = MAC_SCSI_OLD, | 589 | .scsi_type = MAC_SCSI_OLD, |
551 | .scc_type = MAC_SCC_II, | 590 | .scc_type = MAC_SCC_II, |
552 | .nubus_type = MAC_NUBUS | 591 | .nubus_type = MAC_NUBUS, |
592 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
553 | }, | 593 | }, |
554 | 594 | ||
555 | /* | 595 | /* |
@@ -565,7 +605,8 @@ static struct mac_model mac_data_table[] = { | |||
565 | .scsi_type = MAC_SCSI_QUADRA, | 605 | .scsi_type = MAC_SCSI_QUADRA, |
566 | .scc_type = MAC_SCC_QUADRA, | 606 | .scc_type = MAC_SCC_QUADRA, |
567 | .ether_type = MAC_ETHER_SONIC, | 607 | .ether_type = MAC_ETHER_SONIC, |
568 | .nubus_type = MAC_NUBUS | 608 | .nubus_type = MAC_NUBUS, |
609 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
569 | }, { | 610 | }, { |
570 | .ident = MAC_MODEL_C650, | 611 | .ident = MAC_MODEL_C650, |
571 | .name = "Centris 650", | 612 | .name = "Centris 650", |
@@ -574,7 +615,8 @@ static struct mac_model mac_data_table[] = { | |||
574 | .scsi_type = MAC_SCSI_QUADRA, | 615 | .scsi_type = MAC_SCSI_QUADRA, |
575 | .scc_type = MAC_SCC_QUADRA, | 616 | .scc_type = MAC_SCC_QUADRA, |
576 | .ether_type = MAC_ETHER_SONIC, | 617 | .ether_type = MAC_ETHER_SONIC, |
577 | .nubus_type = MAC_NUBUS | 618 | .nubus_type = MAC_NUBUS, |
619 | .floppy_type = MAC_FLOPPY_SWIM_ADDR1 | ||
578 | }, { | 620 | }, { |
579 | .ident = MAC_MODEL_C660, | 621 | .ident = MAC_MODEL_C660, |
580 | .name = "Centris 660AV", | 622 | .name = "Centris 660AV", |
@@ -583,7 +625,8 @@ static struct mac_model mac_data_table[] = { | |||
583 | .scsi_type = MAC_SCSI_QUADRA3, | 625 | .scsi_type = MAC_SCSI_QUADRA3, |
584 | .scc_type = MAC_SCC_PSC, | 626 | .scc_type = MAC_SCC_PSC, |
585 | .ether_type = MAC_ETHER_MACE, | 627 | .ether_type = MAC_ETHER_MACE, |
586 | .nubus_type = MAC_NUBUS | 628 | .nubus_type = MAC_NUBUS, |
629 | .floppy_type = MAC_FLOPPY_AV | ||
587 | }, | 630 | }, |
588 | 631 | ||
589 | /* | 632 | /* |
@@ -599,7 +642,8 @@ static struct mac_model mac_data_table[] = { | |||
599 | .via_type = MAC_VIA_QUADRA, | 642 | .via_type = MAC_VIA_QUADRA, |
600 | .scsi_type = MAC_SCSI_OLD, | 643 | .scsi_type = MAC_SCSI_OLD, |
601 | .scc_type = MAC_SCC_QUADRA, | 644 | .scc_type = MAC_SCC_QUADRA, |
602 | .nubus_type = MAC_NUBUS | 645 | .nubus_type = MAC_NUBUS, |
646 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
603 | }, { | 647 | }, { |
604 | .ident = MAC_MODEL_PB145, | 648 | .ident = MAC_MODEL_PB145, |
605 | .name = "PowerBook 145", | 649 | .name = "PowerBook 145", |
@@ -607,7 +651,8 @@ static struct mac_model mac_data_table[] = { | |||
607 | .via_type = MAC_VIA_QUADRA, | 651 | .via_type = MAC_VIA_QUADRA, |
608 | .scsi_type = MAC_SCSI_OLD, | 652 | .scsi_type = MAC_SCSI_OLD, |
609 | .scc_type = MAC_SCC_QUADRA, | 653 | .scc_type = MAC_SCC_QUADRA, |
610 | .nubus_type = MAC_NUBUS | 654 | .nubus_type = MAC_NUBUS, |
655 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
611 | }, { | 656 | }, { |
612 | .ident = MAC_MODEL_PB150, | 657 | .ident = MAC_MODEL_PB150, |
613 | .name = "PowerBook 150", | 658 | .name = "PowerBook 150", |
@@ -616,7 +661,8 @@ static struct mac_model mac_data_table[] = { | |||
616 | .scsi_type = MAC_SCSI_OLD, | 661 | .scsi_type = MAC_SCSI_OLD, |
617 | .ide_type = MAC_IDE_PB, | 662 | .ide_type = MAC_IDE_PB, |
618 | .scc_type = MAC_SCC_QUADRA, | 663 | .scc_type = MAC_SCC_QUADRA, |
619 | .nubus_type = MAC_NUBUS | 664 | .nubus_type = MAC_NUBUS, |
665 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
620 | }, { | 666 | }, { |
621 | .ident = MAC_MODEL_PB160, | 667 | .ident = MAC_MODEL_PB160, |
622 | .name = "PowerBook 160", | 668 | .name = "PowerBook 160", |
@@ -624,7 +670,8 @@ static struct mac_model mac_data_table[] = { | |||
624 | .via_type = MAC_VIA_QUADRA, | 670 | .via_type = MAC_VIA_QUADRA, |
625 | .scsi_type = MAC_SCSI_OLD, | 671 | .scsi_type = MAC_SCSI_OLD, |
626 | .scc_type = MAC_SCC_QUADRA, | 672 | .scc_type = MAC_SCC_QUADRA, |
627 | .nubus_type = MAC_NUBUS | 673 | .nubus_type = MAC_NUBUS, |
674 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
628 | }, { | 675 | }, { |
629 | .ident = MAC_MODEL_PB165, | 676 | .ident = MAC_MODEL_PB165, |
630 | .name = "PowerBook 165", | 677 | .name = "PowerBook 165", |
@@ -632,7 +679,8 @@ static struct mac_model mac_data_table[] = { | |||
632 | .via_type = MAC_VIA_QUADRA, | 679 | .via_type = MAC_VIA_QUADRA, |
633 | .scsi_type = MAC_SCSI_OLD, | 680 | .scsi_type = MAC_SCSI_OLD, |
634 | .scc_type = MAC_SCC_QUADRA, | 681 | .scc_type = MAC_SCC_QUADRA, |
635 | .nubus_type = MAC_NUBUS | 682 | .nubus_type = MAC_NUBUS, |
683 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
636 | }, { | 684 | }, { |
637 | .ident = MAC_MODEL_PB165C, | 685 | .ident = MAC_MODEL_PB165C, |
638 | .name = "PowerBook 165c", | 686 | .name = "PowerBook 165c", |
@@ -640,7 +688,8 @@ static struct mac_model mac_data_table[] = { | |||
640 | .via_type = MAC_VIA_QUADRA, | 688 | .via_type = MAC_VIA_QUADRA, |
641 | .scsi_type = MAC_SCSI_OLD, | 689 | .scsi_type = MAC_SCSI_OLD, |
642 | .scc_type = MAC_SCC_QUADRA, | 690 | .scc_type = MAC_SCC_QUADRA, |
643 | .nubus_type = MAC_NUBUS | 691 | .nubus_type = MAC_NUBUS, |
692 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
644 | }, { | 693 | }, { |
645 | .ident = MAC_MODEL_PB170, | 694 | .ident = MAC_MODEL_PB170, |
646 | .name = "PowerBook 170", | 695 | .name = "PowerBook 170", |
@@ -648,7 +697,8 @@ static struct mac_model mac_data_table[] = { | |||
648 | .via_type = MAC_VIA_QUADRA, | 697 | .via_type = MAC_VIA_QUADRA, |
649 | .scsi_type = MAC_SCSI_OLD, | 698 | .scsi_type = MAC_SCSI_OLD, |
650 | .scc_type = MAC_SCC_QUADRA, | 699 | .scc_type = MAC_SCC_QUADRA, |
651 | .nubus_type = MAC_NUBUS | 700 | .nubus_type = MAC_NUBUS, |
701 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
652 | }, { | 702 | }, { |
653 | .ident = MAC_MODEL_PB180, | 703 | .ident = MAC_MODEL_PB180, |
654 | .name = "PowerBook 180", | 704 | .name = "PowerBook 180", |
@@ -656,7 +706,8 @@ static struct mac_model mac_data_table[] = { | |||
656 | .via_type = MAC_VIA_QUADRA, | 706 | .via_type = MAC_VIA_QUADRA, |
657 | .scsi_type = MAC_SCSI_OLD, | 707 | .scsi_type = MAC_SCSI_OLD, |
658 | .scc_type = MAC_SCC_QUADRA, | 708 | .scc_type = MAC_SCC_QUADRA, |
659 | .nubus_type = MAC_NUBUS | 709 | .nubus_type = MAC_NUBUS, |
710 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
660 | }, { | 711 | }, { |
661 | .ident = MAC_MODEL_PB180C, | 712 | .ident = MAC_MODEL_PB180C, |
662 | .name = "PowerBook 180c", | 713 | .name = "PowerBook 180c", |
@@ -664,7 +715,8 @@ static struct mac_model mac_data_table[] = { | |||
664 | .via_type = MAC_VIA_QUADRA, | 715 | .via_type = MAC_VIA_QUADRA, |
665 | .scsi_type = MAC_SCSI_OLD, | 716 | .scsi_type = MAC_SCSI_OLD, |
666 | .scc_type = MAC_SCC_QUADRA, | 717 | .scc_type = MAC_SCC_QUADRA, |
667 | .nubus_type = MAC_NUBUS | 718 | .nubus_type = MAC_NUBUS, |
719 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
668 | }, { | 720 | }, { |
669 | .ident = MAC_MODEL_PB190, | 721 | .ident = MAC_MODEL_PB190, |
670 | .name = "PowerBook 190", | 722 | .name = "PowerBook 190", |
@@ -673,7 +725,8 @@ static struct mac_model mac_data_table[] = { | |||
673 | .scsi_type = MAC_SCSI_OLD, | 725 | .scsi_type = MAC_SCSI_OLD, |
674 | .ide_type = MAC_IDE_BABOON, | 726 | .ide_type = MAC_IDE_BABOON, |
675 | .scc_type = MAC_SCC_QUADRA, | 727 | .scc_type = MAC_SCC_QUADRA, |
676 | .nubus_type = MAC_NUBUS | 728 | .nubus_type = MAC_NUBUS, |
729 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
677 | }, { | 730 | }, { |
678 | .ident = MAC_MODEL_PB520, | 731 | .ident = MAC_MODEL_PB520, |
679 | .name = "PowerBook 520", | 732 | .name = "PowerBook 520", |
@@ -682,7 +735,8 @@ static struct mac_model mac_data_table[] = { | |||
682 | .scsi_type = MAC_SCSI_OLD, | 735 | .scsi_type = MAC_SCSI_OLD, |
683 | .scc_type = MAC_SCC_QUADRA, | 736 | .scc_type = MAC_SCC_QUADRA, |
684 | .ether_type = MAC_ETHER_SONIC, | 737 | .ether_type = MAC_ETHER_SONIC, |
685 | .nubus_type = MAC_NUBUS | 738 | .nubus_type = MAC_NUBUS, |
739 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
686 | }, | 740 | }, |
687 | 741 | ||
688 | /* | 742 | /* |
@@ -702,7 +756,8 @@ static struct mac_model mac_data_table[] = { | |||
702 | .via_type = MAC_VIA_IIci, | 756 | .via_type = MAC_VIA_IIci, |
703 | .scsi_type = MAC_SCSI_OLD, | 757 | .scsi_type = MAC_SCSI_OLD, |
704 | .scc_type = MAC_SCC_QUADRA, | 758 | .scc_type = MAC_SCC_QUADRA, |
705 | .nubus_type = MAC_NUBUS | 759 | .nubus_type = MAC_NUBUS, |
760 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
706 | }, { | 761 | }, { |
707 | .ident = MAC_MODEL_PB230, | 762 | .ident = MAC_MODEL_PB230, |
708 | .name = "PowerBook Duo 230", | 763 | .name = "PowerBook Duo 230", |
@@ -710,7 +765,8 @@ static struct mac_model mac_data_table[] = { | |||
710 | .via_type = MAC_VIA_IIci, | 765 | .via_type = MAC_VIA_IIci, |
711 | .scsi_type = MAC_SCSI_OLD, | 766 | .scsi_type = MAC_SCSI_OLD, |
712 | .scc_type = MAC_SCC_QUADRA, | 767 | .scc_type = MAC_SCC_QUADRA, |
713 | .nubus_type = MAC_NUBUS | 768 | .nubus_type = MAC_NUBUS, |
769 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
714 | }, { | 770 | }, { |
715 | .ident = MAC_MODEL_PB250, | 771 | .ident = MAC_MODEL_PB250, |
716 | .name = "PowerBook Duo 250", | 772 | .name = "PowerBook Duo 250", |
@@ -718,7 +774,8 @@ static struct mac_model mac_data_table[] = { | |||
718 | .via_type = MAC_VIA_IIci, | 774 | .via_type = MAC_VIA_IIci, |
719 | .scsi_type = MAC_SCSI_OLD, | 775 | .scsi_type = MAC_SCSI_OLD, |
720 | .scc_type = MAC_SCC_QUADRA, | 776 | .scc_type = MAC_SCC_QUADRA, |
721 | .nubus_type = MAC_NUBUS | 777 | .nubus_type = MAC_NUBUS, |
778 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
722 | }, { | 779 | }, { |
723 | .ident = MAC_MODEL_PB270C, | 780 | .ident = MAC_MODEL_PB270C, |
724 | .name = "PowerBook Duo 270c", | 781 | .name = "PowerBook Duo 270c", |
@@ -726,7 +783,8 @@ static struct mac_model mac_data_table[] = { | |||
726 | .via_type = MAC_VIA_IIci, | 783 | .via_type = MAC_VIA_IIci, |
727 | .scsi_type = MAC_SCSI_OLD, | 784 | .scsi_type = MAC_SCSI_OLD, |
728 | .scc_type = MAC_SCC_QUADRA, | 785 | .scc_type = MAC_SCC_QUADRA, |
729 | .nubus_type = MAC_NUBUS | 786 | .nubus_type = MAC_NUBUS, |
787 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
730 | }, { | 788 | }, { |
731 | .ident = MAC_MODEL_PB280, | 789 | .ident = MAC_MODEL_PB280, |
732 | .name = "PowerBook Duo 280", | 790 | .name = "PowerBook Duo 280", |
@@ -734,7 +792,8 @@ static struct mac_model mac_data_table[] = { | |||
734 | .via_type = MAC_VIA_IIci, | 792 | .via_type = MAC_VIA_IIci, |
735 | .scsi_type = MAC_SCSI_OLD, | 793 | .scsi_type = MAC_SCSI_OLD, |
736 | .scc_type = MAC_SCC_QUADRA, | 794 | .scc_type = MAC_SCC_QUADRA, |
737 | .nubus_type = MAC_NUBUS | 795 | .nubus_type = MAC_NUBUS, |
796 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
738 | }, { | 797 | }, { |
739 | .ident = MAC_MODEL_PB280C, | 798 | .ident = MAC_MODEL_PB280C, |
740 | .name = "PowerBook Duo 280c", | 799 | .name = "PowerBook Duo 280c", |
@@ -742,7 +801,8 @@ static struct mac_model mac_data_table[] = { | |||
742 | .via_type = MAC_VIA_IIci, | 801 | .via_type = MAC_VIA_IIci, |
743 | .scsi_type = MAC_SCSI_OLD, | 802 | .scsi_type = MAC_SCSI_OLD, |
744 | .scc_type = MAC_SCC_QUADRA, | 803 | .scc_type = MAC_SCC_QUADRA, |
745 | .nubus_type = MAC_NUBUS | 804 | .nubus_type = MAC_NUBUS, |
805 | .floppy_type = MAC_FLOPPY_SWIM_ADDR2 | ||
746 | }, | 806 | }, |
747 | 807 | ||
748 | /* | 808 | /* |
@@ -815,3 +875,42 @@ static void mac_get_model(char *str) | |||
815 | strcpy(str, "Macintosh "); | 875 | strcpy(str, "Macintosh "); |
816 | strcat(str, macintosh_config->name); | 876 | strcat(str, macintosh_config->name); |
817 | } | 877 | } |
878 | |||
879 | static struct resource swim_resources[1]; | ||
880 | |||
881 | static struct platform_device swim_device = { | ||
882 | .name = "swim", | ||
883 | .id = -1, | ||
884 | .num_resources = ARRAY_SIZE(swim_resources), | ||
885 | .resource = swim_resources, | ||
886 | }; | ||
887 | |||
888 | static struct platform_device *mac_platform_devices[] __initdata = { | ||
889 | &swim_device | ||
890 | }; | ||
891 | |||
892 | int __init mac_platform_init(void) | ||
893 | { | ||
894 | u8 *swim_base; | ||
895 | |||
896 | switch (macintosh_config->floppy_type) { | ||
897 | case MAC_FLOPPY_SWIM_ADDR1: | ||
898 | swim_base = (u8 *)(VIA1_BASE + 0x1E000); | ||
899 | break; | ||
900 | case MAC_FLOPPY_SWIM_ADDR2: | ||
901 | swim_base = (u8 *)(VIA1_BASE + 0x16000); | ||
902 | break; | ||
903 | default: | ||
904 | return 0; | ||
905 | } | ||
906 | |||
907 | swim_resources[0].name = "swim-regs"; | ||
908 | swim_resources[0].start = (resource_size_t)swim_base; | ||
909 | swim_resources[0].end = (resource_size_t)(swim_base + SWIM_IO_SIZE); | ||
910 | swim_resources[0].flags = IORESOURCE_MEM; | ||
911 | |||
912 | return platform_add_devices(mac_platform_devices, | ||
913 | ARRAY_SIZE(mac_platform_devices)); | ||
914 | } | ||
915 | |||
916 | arch_initcall(mac_platform_init); | ||
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index 7d97ba54536e..11bce3cb6482 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c | |||
@@ -645,3 +645,12 @@ int via_irq_pending(int irq) | |||
645 | } | 645 | } |
646 | return 0; | 646 | return 0; |
647 | } | 647 | } |
648 | |||
649 | void via1_set_head(int head) | ||
650 | { | ||
651 | if (head == 0) | ||
652 | via1[vBufA] &= ~VIA1A_vHeadSel; | ||
653 | else | ||
654 | via1[vBufA] |= VIA1A_vHeadSel; | ||
655 | } | ||
656 | EXPORT_SYMBOL(via1_set_head); | ||