aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/m68k/include/asm/macintosh.h2
-rw-r--r--arch/m68k/mac/config.c52
-rw-r--r--arch/m68k/mac/via.c12
3 files changed, 31 insertions, 35 deletions
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h
index b02418c45b86..682a1a2ff55f 100644
--- a/arch/m68k/include/asm/macintosh.h
+++ b/arch/m68k/include/asm/macintosh.h
@@ -42,7 +42,7 @@ struct mac_model
42#define MAC_ADB_IOP 6 42#define MAC_ADB_IOP 6
43 43
44#define MAC_VIA_II 1 44#define MAC_VIA_II 1
45#define MAC_VIA_IIci 2 45#define MAC_VIA_IICI 2
46#define MAC_VIA_QUADRA 3 46#define MAC_VIA_QUADRA 3
47 47
48#define MAC_SCSI_NONE 0 48#define MAC_SCSI_NONE 0
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index b20b1318462c..f60ff5f59205 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -221,7 +221,7 @@ void __init config_mac(void)
221 * inaccurate, so look here if a new Mac model won't run. Example: if 221 * inaccurate, so look here if a new Mac model won't run. Example: if
222 * a Mac crashes immediately after the VIA1 registers have been dumped 222 * a Mac crashes immediately after the VIA1 registers have been dumped
223 * to the screen, it probably died attempting to read DirB on a RBV. 223 * to the screen, it probably died attempting to read DirB on a RBV.
224 * Meaning it should have MAC_VIA_IIci here :-) 224 * Meaning it should have MAC_VIA_IICI here :-)
225 */ 225 */
226 226
227struct mac_model *macintosh_config; 227struct mac_model *macintosh_config;
@@ -296,7 +296,7 @@ static struct mac_model mac_data_table[] = {
296 .ident = MAC_MODEL_IICI, 296 .ident = MAC_MODEL_IICI,
297 .name = "IIci", 297 .name = "IIci",
298 .adb_type = MAC_ADB_II, 298 .adb_type = MAC_ADB_II,
299 .via_type = MAC_VIA_IIci, 299 .via_type = MAC_VIA_IICI,
300 .scsi_type = MAC_SCSI_OLD, 300 .scsi_type = MAC_SCSI_OLD,
301 .scc_type = MAC_SCC_II, 301 .scc_type = MAC_SCC_II,
302 .nubus_type = MAC_NUBUS, 302 .nubus_type = MAC_NUBUS,
@@ -305,7 +305,7 @@ static struct mac_model mac_data_table[] = {
305 .ident = MAC_MODEL_IIFX, 305 .ident = MAC_MODEL_IIFX,
306 .name = "IIfx", 306 .name = "IIfx",
307 .adb_type = MAC_ADB_IOP, 307 .adb_type = MAC_ADB_IOP,
308 .via_type = MAC_VIA_IIci, 308 .via_type = MAC_VIA_IICI,
309 .scsi_type = MAC_SCSI_OLD, 309 .scsi_type = MAC_SCSI_OLD,
310 .scc_type = MAC_SCC_IOP, 310 .scc_type = MAC_SCC_IOP,
311 .nubus_type = MAC_NUBUS, 311 .nubus_type = MAC_NUBUS,
@@ -314,7 +314,7 @@ static struct mac_model mac_data_table[] = {
314 .ident = MAC_MODEL_IISI, 314 .ident = MAC_MODEL_IISI,
315 .name = "IIsi", 315 .name = "IIsi",
316 .adb_type = MAC_ADB_IISI, 316 .adb_type = MAC_ADB_IISI,
317 .via_type = MAC_VIA_IIci, 317 .via_type = MAC_VIA_IICI,
318 .scsi_type = MAC_SCSI_OLD, 318 .scsi_type = MAC_SCSI_OLD,
319 .scc_type = MAC_SCC_II, 319 .scc_type = MAC_SCC_II,
320 .nubus_type = MAC_NUBUS, 320 .nubus_type = MAC_NUBUS,
@@ -323,7 +323,7 @@ static struct mac_model mac_data_table[] = {
323 .ident = MAC_MODEL_IIVI, 323 .ident = MAC_MODEL_IIVI,
324 .name = "IIvi", 324 .name = "IIvi",
325 .adb_type = MAC_ADB_IISI, 325 .adb_type = MAC_ADB_IISI,
326 .via_type = MAC_VIA_IIci, 326 .via_type = MAC_VIA_IICI,
327 .scsi_type = MAC_SCSI_OLD, 327 .scsi_type = MAC_SCSI_OLD,
328 .scc_type = MAC_SCC_II, 328 .scc_type = MAC_SCC_II,
329 .nubus_type = MAC_NUBUS, 329 .nubus_type = MAC_NUBUS,
@@ -332,7 +332,7 @@ static struct mac_model mac_data_table[] = {
332 .ident = MAC_MODEL_IIVX, 332 .ident = MAC_MODEL_IIVX,
333 .name = "IIvx", 333 .name = "IIvx",
334 .adb_type = MAC_ADB_IISI, 334 .adb_type = MAC_ADB_IISI,
335 .via_type = MAC_VIA_IIci, 335 .via_type = MAC_VIA_IICI,
336 .scsi_type = MAC_SCSI_OLD, 336 .scsi_type = MAC_SCSI_OLD,
337 .scc_type = MAC_SCC_II, 337 .scc_type = MAC_SCC_II,
338 .nubus_type = MAC_NUBUS, 338 .nubus_type = MAC_NUBUS,
@@ -347,7 +347,7 @@ static struct mac_model mac_data_table[] = {
347 .ident = MAC_MODEL_CLII, 347 .ident = MAC_MODEL_CLII,
348 .name = "Classic II", 348 .name = "Classic II",
349 .adb_type = MAC_ADB_IISI, 349 .adb_type = MAC_ADB_IISI,
350 .via_type = MAC_VIA_IIci, 350 .via_type = MAC_VIA_IICI,
351 .scsi_type = MAC_SCSI_OLD, 351 .scsi_type = MAC_SCSI_OLD,
352 .scc_type = MAC_SCC_II, 352 .scc_type = MAC_SCC_II,
353 .nubus_type = MAC_NUBUS, 353 .nubus_type = MAC_NUBUS,
@@ -356,7 +356,7 @@ static struct mac_model mac_data_table[] = {
356 .ident = MAC_MODEL_CCL, 356 .ident = MAC_MODEL_CCL,
357 .name = "Color Classic", 357 .name = "Color Classic",
358 .adb_type = MAC_ADB_CUDA, 358 .adb_type = MAC_ADB_CUDA,
359 .via_type = MAC_VIA_IIci, 359 .via_type = MAC_VIA_IICI,
360 .scsi_type = MAC_SCSI_OLD, 360 .scsi_type = MAC_SCSI_OLD,
361 .scc_type = MAC_SCC_II, 361 .scc_type = MAC_SCC_II,
362 .nubus_type = MAC_NUBUS, 362 .nubus_type = MAC_NUBUS,
@@ -365,7 +365,7 @@ static struct mac_model mac_data_table[] = {
365 .ident = MAC_MODEL_CCLII, 365 .ident = MAC_MODEL_CCLII,
366 .name = "Color Classic II", 366 .name = "Color Classic II",
367 .adb_type = MAC_ADB_CUDA, 367 .adb_type = MAC_ADB_CUDA,
368 .via_type = MAC_VIA_IIci, 368 .via_type = MAC_VIA_IICI,
369 .scsi_type = MAC_SCSI_OLD, 369 .scsi_type = MAC_SCSI_OLD,
370 .scc_type = MAC_SCC_II, 370 .scc_type = MAC_SCC_II,
371 .nubus_type = MAC_NUBUS, 371 .nubus_type = MAC_NUBUS,
@@ -380,7 +380,7 @@ static struct mac_model mac_data_table[] = {
380 .ident = MAC_MODEL_LC, 380 .ident = MAC_MODEL_LC,
381 .name = "LC", 381 .name = "LC",
382 .adb_type = MAC_ADB_IISI, 382 .adb_type = MAC_ADB_IISI,
383 .via_type = MAC_VIA_IIci, 383 .via_type = MAC_VIA_IICI,
384 .scsi_type = MAC_SCSI_OLD, 384 .scsi_type = MAC_SCSI_OLD,
385 .scc_type = MAC_SCC_II, 385 .scc_type = MAC_SCC_II,
386 .nubus_type = MAC_NUBUS, 386 .nubus_type = MAC_NUBUS,
@@ -389,7 +389,7 @@ static struct mac_model mac_data_table[] = {
389 .ident = MAC_MODEL_LCII, 389 .ident = MAC_MODEL_LCII,
390 .name = "LC II", 390 .name = "LC II",
391 .adb_type = MAC_ADB_IISI, 391 .adb_type = MAC_ADB_IISI,
392 .via_type = MAC_VIA_IIci, 392 .via_type = MAC_VIA_IICI,
393 .scsi_type = MAC_SCSI_OLD, 393 .scsi_type = MAC_SCSI_OLD,
394 .scc_type = MAC_SCC_II, 394 .scc_type = MAC_SCC_II,
395 .nubus_type = MAC_NUBUS, 395 .nubus_type = MAC_NUBUS,
@@ -398,7 +398,7 @@ static struct mac_model mac_data_table[] = {
398 .ident = MAC_MODEL_LCIII, 398 .ident = MAC_MODEL_LCIII,
399 .name = "LC III", 399 .name = "LC III",
400 .adb_type = MAC_ADB_IISI, 400 .adb_type = MAC_ADB_IISI,
401 .via_type = MAC_VIA_IIci, 401 .via_type = MAC_VIA_IICI,
402 .scsi_type = MAC_SCSI_OLD, 402 .scsi_type = MAC_SCSI_OLD,
403 .scc_type = MAC_SCC_II, 403 .scc_type = MAC_SCC_II,
404 .nubus_type = MAC_NUBUS, 404 .nubus_type = MAC_NUBUS,
@@ -526,7 +526,7 @@ static struct mac_model mac_data_table[] = {
526 .ident = MAC_MODEL_P460, 526 .ident = MAC_MODEL_P460,
527 .name = "Performa 460", 527 .name = "Performa 460",
528 .adb_type = MAC_ADB_IISI, 528 .adb_type = MAC_ADB_IISI,
529 .via_type = MAC_VIA_IIci, 529 .via_type = MAC_VIA_IICI,
530 .scsi_type = MAC_SCSI_OLD, 530 .scsi_type = MAC_SCSI_OLD,
531 .scc_type = MAC_SCC_II, 531 .scc_type = MAC_SCC_II,
532 .nubus_type = MAC_NUBUS, 532 .nubus_type = MAC_NUBUS,
@@ -553,7 +553,7 @@ static struct mac_model mac_data_table[] = {
553 .ident = MAC_MODEL_P520, 553 .ident = MAC_MODEL_P520,
554 .name = "Performa 520", 554 .name = "Performa 520",
555 .adb_type = MAC_ADB_CUDA, 555 .adb_type = MAC_ADB_CUDA,
556 .via_type = MAC_VIA_IIci, 556 .via_type = MAC_VIA_IICI,
557 .scsi_type = MAC_SCSI_OLD, 557 .scsi_type = MAC_SCSI_OLD,
558 .scc_type = MAC_SCC_II, 558 .scc_type = MAC_SCC_II,
559 .nubus_type = MAC_NUBUS, 559 .nubus_type = MAC_NUBUS,
@@ -562,7 +562,7 @@ static struct mac_model mac_data_table[] = {
562 .ident = MAC_MODEL_P550, 562 .ident = MAC_MODEL_P550,
563 .name = "Performa 550", 563 .name = "Performa 550",
564 .adb_type = MAC_ADB_CUDA, 564 .adb_type = MAC_ADB_CUDA,
565 .via_type = MAC_VIA_IIci, 565 .via_type = MAC_VIA_IICI,
566 .scsi_type = MAC_SCSI_OLD, 566 .scsi_type = MAC_SCSI_OLD,
567 .scc_type = MAC_SCC_II, 567 .scc_type = MAC_SCC_II,
568 .nubus_type = MAC_NUBUS, 568 .nubus_type = MAC_NUBUS,
@@ -594,7 +594,7 @@ static struct mac_model mac_data_table[] = {
594 .ident = MAC_MODEL_TV, 594 .ident = MAC_MODEL_TV,
595 .name = "TV", 595 .name = "TV",
596 .adb_type = MAC_ADB_CUDA, 596 .adb_type = MAC_ADB_CUDA,
597 .via_type = MAC_VIA_IIci, 597 .via_type = MAC_VIA_IICI,
598 .scsi_type = MAC_SCSI_OLD, 598 .scsi_type = MAC_SCSI_OLD,
599 .scc_type = MAC_SCC_II, 599 .scc_type = MAC_SCC_II,
600 .nubus_type = MAC_NUBUS, 600 .nubus_type = MAC_NUBUS,
@@ -603,7 +603,7 @@ static struct mac_model mac_data_table[] = {
603 .ident = MAC_MODEL_P600, 603 .ident = MAC_MODEL_P600,
604 .name = "Performa 600", 604 .name = "Performa 600",
605 .adb_type = MAC_ADB_IISI, 605 .adb_type = MAC_ADB_IISI,
606 .via_type = MAC_VIA_IIci, 606 .via_type = MAC_VIA_IICI,
607 .scsi_type = MAC_SCSI_OLD, 607 .scsi_type = MAC_SCSI_OLD,
608 .scc_type = MAC_SCC_II, 608 .scc_type = MAC_SCC_II,
609 .nubus_type = MAC_NUBUS, 609 .nubus_type = MAC_NUBUS,
@@ -675,7 +675,7 @@ static struct mac_model mac_data_table[] = {
675 .ident = MAC_MODEL_PB150, 675 .ident = MAC_MODEL_PB150,
676 .name = "PowerBook 150", 676 .name = "PowerBook 150",
677 .adb_type = MAC_ADB_PB2, 677 .adb_type = MAC_ADB_PB2,
678 .via_type = MAC_VIA_IIci, 678 .via_type = MAC_VIA_IICI,
679 .scsi_type = MAC_SCSI_OLD, 679 .scsi_type = MAC_SCSI_OLD,
680 .ide_type = MAC_IDE_PB, 680 .ide_type = MAC_IDE_PB,
681 .scc_type = MAC_SCC_QUADRA, 681 .scc_type = MAC_SCC_QUADRA,
@@ -761,17 +761,13 @@ static struct mac_model mac_data_table[] = {
761 * PowerBook Duos are pretty much like normal PowerBooks 761 * PowerBook Duos are pretty much like normal PowerBooks
762 * All of these probably have onboard SONIC in the Dock which 762 * All of these probably have onboard SONIC in the Dock which
763 * means we'll have to probe for it eventually. 763 * means we'll have to probe for it eventually.
764 *
765 * Are these really MAC_VIA_IIci? The developer notes for the
766 * Duos show pretty much the same custom parts as in most of
767 * the other PowerBooks which would imply MAC_VIA_QUADRA.
768 */ 764 */
769 765
770 { 766 {
771 .ident = MAC_MODEL_PB210, 767 .ident = MAC_MODEL_PB210,
772 .name = "PowerBook Duo 210", 768 .name = "PowerBook Duo 210",
773 .adb_type = MAC_ADB_PB2, 769 .adb_type = MAC_ADB_PB2,
774 .via_type = MAC_VIA_IIci, 770 .via_type = MAC_VIA_IICI,
775 .scsi_type = MAC_SCSI_OLD, 771 .scsi_type = MAC_SCSI_OLD,
776 .scc_type = MAC_SCC_QUADRA, 772 .scc_type = MAC_SCC_QUADRA,
777 .nubus_type = MAC_NUBUS, 773 .nubus_type = MAC_NUBUS,
@@ -780,7 +776,7 @@ static struct mac_model mac_data_table[] = {
780 .ident = MAC_MODEL_PB230, 776 .ident = MAC_MODEL_PB230,
781 .name = "PowerBook Duo 230", 777 .name = "PowerBook Duo 230",
782 .adb_type = MAC_ADB_PB2, 778 .adb_type = MAC_ADB_PB2,
783 .via_type = MAC_VIA_IIci, 779 .via_type = MAC_VIA_IICI,
784 .scsi_type = MAC_SCSI_OLD, 780 .scsi_type = MAC_SCSI_OLD,
785 .scc_type = MAC_SCC_QUADRA, 781 .scc_type = MAC_SCC_QUADRA,
786 .nubus_type = MAC_NUBUS, 782 .nubus_type = MAC_NUBUS,
@@ -789,7 +785,7 @@ static struct mac_model mac_data_table[] = {
789 .ident = MAC_MODEL_PB250, 785 .ident = MAC_MODEL_PB250,
790 .name = "PowerBook Duo 250", 786 .name = "PowerBook Duo 250",
791 .adb_type = MAC_ADB_PB2, 787 .adb_type = MAC_ADB_PB2,
792 .via_type = MAC_VIA_IIci, 788 .via_type = MAC_VIA_IICI,
793 .scsi_type = MAC_SCSI_OLD, 789 .scsi_type = MAC_SCSI_OLD,
794 .scc_type = MAC_SCC_QUADRA, 790 .scc_type = MAC_SCC_QUADRA,
795 .nubus_type = MAC_NUBUS, 791 .nubus_type = MAC_NUBUS,
@@ -798,7 +794,7 @@ static struct mac_model mac_data_table[] = {
798 .ident = MAC_MODEL_PB270C, 794 .ident = MAC_MODEL_PB270C,
799 .name = "PowerBook Duo 270c", 795 .name = "PowerBook Duo 270c",
800 .adb_type = MAC_ADB_PB2, 796 .adb_type = MAC_ADB_PB2,
801 .via_type = MAC_VIA_IIci, 797 .via_type = MAC_VIA_IICI,
802 .scsi_type = MAC_SCSI_OLD, 798 .scsi_type = MAC_SCSI_OLD,
803 .scc_type = MAC_SCC_QUADRA, 799 .scc_type = MAC_SCC_QUADRA,
804 .nubus_type = MAC_NUBUS, 800 .nubus_type = MAC_NUBUS,
@@ -807,7 +803,7 @@ static struct mac_model mac_data_table[] = {
807 .ident = MAC_MODEL_PB280, 803 .ident = MAC_MODEL_PB280,
808 .name = "PowerBook Duo 280", 804 .name = "PowerBook Duo 280",
809 .adb_type = MAC_ADB_PB2, 805 .adb_type = MAC_ADB_PB2,
810 .via_type = MAC_VIA_IIci, 806 .via_type = MAC_VIA_IICI,
811 .scsi_type = MAC_SCSI_OLD, 807 .scsi_type = MAC_SCSI_OLD,
812 .scc_type = MAC_SCC_QUADRA, 808 .scc_type = MAC_SCC_QUADRA,
813 .nubus_type = MAC_NUBUS, 809 .nubus_type = MAC_NUBUS,
@@ -816,7 +812,7 @@ static struct mac_model mac_data_table[] = {
816 .ident = MAC_MODEL_PB280C, 812 .ident = MAC_MODEL_PB280C,
817 .name = "PowerBook Duo 280c", 813 .name = "PowerBook Duo 280c",
818 .adb_type = MAC_ADB_PB2, 814 .adb_type = MAC_ADB_PB2,
819 .via_type = MAC_VIA_IIci, 815 .via_type = MAC_VIA_IICI,
820 .scsi_type = MAC_SCSI_OLD, 816 .scsi_type = MAC_SCSI_OLD,
821 .scc_type = MAC_SCC_QUADRA, 817 .scc_type = MAC_SCC_QUADRA,
822 .nubus_type = MAC_NUBUS, 818 .nubus_type = MAC_NUBUS,
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 7a2993bb092d..2d85662715fb 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -126,7 +126,7 @@ void __init via_init(void)
126 126
127 /* IIci, IIsi, IIvx, IIvi (P6xx), LC series */ 127 /* IIci, IIsi, IIvx, IIvi (P6xx), LC series */
128 128
129 case MAC_VIA_IIci: 129 case MAC_VIA_IICI:
130 via1 = (void *) VIA1_BASE; 130 via1 = (void *) VIA1_BASE;
131 if (macintosh_config->ident == MAC_MODEL_IIFX) { 131 if (macintosh_config->ident == MAC_MODEL_IIFX) {
132 via2 = NULL; 132 via2 = NULL;
@@ -399,7 +399,7 @@ void __init via_nubus_init(void)
399 case MAC_VIA_QUADRA: 399 case MAC_VIA_QUADRA:
400 pr_debug("VIA2 vDirA is 0x%02X\n", via2[vDirA]); 400 pr_debug("VIA2 vDirA is 0x%02X\n", via2[vDirA]);
401 break; 401 break;
402 case MAC_VIA_IIci: 402 case MAC_VIA_IICI:
403 /* RBV. Disable all the slot interrupts. SIER works like IER. */ 403 /* RBV. Disable all the slot interrupts. SIER works like IER. */
404 via2[rSIER] = 0x7F; 404 via2[rSIER] = 0x7F;
405 break; 405 break;
@@ -422,7 +422,7 @@ void via_nubus_irq_startup(int irq)
422 via2[vDirA] &= 0x80 | ~(1 << irq_idx); 422 via2[vDirA] &= 0x80 | ~(1 << irq_idx);
423 } 423 }
424 /* fall through */ 424 /* fall through */
425 case MAC_VIA_IIci: 425 case MAC_VIA_IICI:
426 via_irq_enable(irq); 426 via_irq_enable(irq);
427 break; 427 break;
428 } 428 }
@@ -436,7 +436,7 @@ void via_nubus_irq_shutdown(int irq)
436 /* Ensure that the umbrella CA1 interrupt remains enabled. */ 436 /* Ensure that the umbrella CA1 interrupt remains enabled. */
437 via_irq_enable(irq); 437 via_irq_enable(irq);
438 break; 438 break;
439 case MAC_VIA_IIci: 439 case MAC_VIA_IICI:
440 via_irq_disable(irq); 440 via_irq_disable(irq);
441 break; 441 break;
442 } 442 }
@@ -569,7 +569,7 @@ void via_irq_enable(int irq) {
569 if (!nubus_disabled) 569 if (!nubus_disabled)
570 via2[gIER] = IER_SET_BIT(1); 570 via2[gIER] = IER_SET_BIT(1);
571 break; 571 break;
572 case MAC_VIA_IIci: 572 case MAC_VIA_IICI:
573 /* On RBV, enable the slot interrupt. 573 /* On RBV, enable the slot interrupt.
574 * SIER works like IER. 574 * SIER works like IER.
575 */ 575 */
@@ -599,7 +599,7 @@ void via_irq_disable(int irq) {
599 if (nubus_disabled) 599 if (nubus_disabled)
600 via2[gIER] = IER_CLR_BIT(1); 600 via2[gIER] = IER_CLR_BIT(1);
601 break; 601 break;
602 case MAC_VIA_IIci: 602 case MAC_VIA_IICI:
603 via2[rSIER] = IER_CLR_BIT(irq_idx); 603 via2[rSIER] = IER_CLR_BIT(irq_idx);
604 break; 604 break;
605 } 605 }
generated by cgit v1.2.2 (git 2.25.0) at 2026-01-03 15:06:12 -0500