diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2009-11-17 04:06:48 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-02-27 12:31:09 -0500 |
commit | 80614e5ab1458ff3ccced4d6ba2fa386575c8d5c (patch) | |
tree | e34007d1ce2abb0c8c451764107973909798cac3 /arch/m68k/include/asm | |
parent | ec9cbe09899e36b5f216c3232215520dcf0320ab (diff) |
mac68k: replace mac68k SCC code with platform device
Remove the old 68k Mac serial port code and a lot of related cruft. Add
new SCC platform devices to mac 68k platform.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm')
-rw-r--r-- | arch/m68k/include/asm/machw.h | 25 | ||||
-rw-r--r-- | arch/m68k/include/asm/macints.h | 22 |
2 files changed, 5 insertions, 42 deletions
diff --git a/arch/m68k/include/asm/machw.h b/arch/m68k/include/asm/machw.h index 2b4de0c2ce4a..a22095164927 100644 --- a/arch/m68k/include/asm/machw.h +++ b/arch/m68k/include/asm/machw.h | |||
@@ -21,29 +21,4 @@ | |||
21 | #define VIDEOMEMSIZE (4096*1024) | 21 | #define VIDEOMEMSIZE (4096*1024) |
22 | #define VIDEOMEMMASK (-4096*1024) | 22 | #define VIDEOMEMMASK (-4096*1024) |
23 | 23 | ||
24 | #ifndef __ASSEMBLY__ | ||
25 | |||
26 | #include <linux/types.h> | ||
27 | |||
28 | #if 0 | ||
29 | /* | ||
30 | ** SCC Z8530 | ||
31 | */ | ||
32 | |||
33 | #define MAC_SCC_BAS (0x50F04000) | ||
34 | struct MAC_SCC | ||
35 | { | ||
36 | u_char cha_a_ctrl; | ||
37 | u_char char_dummy1; | ||
38 | u_char cha_a_data; | ||
39 | u_char char_dummy2; | ||
40 | u_char cha_b_ctrl; | ||
41 | u_char char_dummy3; | ||
42 | u_char cha_b_data; | ||
43 | }; | ||
44 | # define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS)) | ||
45 | #endif | ||
46 | |||
47 | #endif /* __ASSEMBLY__ */ | ||
48 | |||
49 | #endif /* linux/machw.h */ | 24 | #endif /* linux/machw.h */ |
diff --git a/arch/m68k/include/asm/macints.h b/arch/m68k/include/asm/macints.h index 679c48ab4407..ebe1b70fe90c 100644 --- a/arch/m68k/include/asm/macints.h +++ b/arch/m68k/include/asm/macints.h | |||
@@ -37,7 +37,6 @@ | |||
37 | 37 | ||
38 | #define VIA1_SOURCE_BASE 8 | 38 | #define VIA1_SOURCE_BASE 8 |
39 | #define VIA2_SOURCE_BASE 16 | 39 | #define VIA2_SOURCE_BASE 16 |
40 | #define MAC_SCC_SOURCE_BASE 24 | ||
41 | #define PSC3_SOURCE_BASE 24 | 40 | #define PSC3_SOURCE_BASE 24 |
42 | #define PSC4_SOURCE_BASE 32 | 41 | #define PSC4_SOURCE_BASE 32 |
43 | #define PSC5_SOURCE_BASE 40 | 42 | #define PSC5_SOURCE_BASE 40 |
@@ -96,26 +95,12 @@ | |||
96 | #define IRQ_PSC3_2 (26) | 95 | #define IRQ_PSC3_2 (26) |
97 | #define IRQ_PSC3_3 (27) | 96 | #define IRQ_PSC3_3 (27) |
98 | 97 | ||
99 | /* Level 4 (SCC) interrupts */ | ||
100 | #define IRQ_SCC (32) | ||
101 | #define IRQ_SCCA (33) | ||
102 | #define IRQ_SCCB (34) | ||
103 | #if 0 /* FIXME: are there multiple interrupt conditions on the SCC ?? */ | ||
104 | /* SCC interrupts */ | ||
105 | #define IRQ_SCCB_TX (32) | ||
106 | #define IRQ_SCCB_STAT (33) | ||
107 | #define IRQ_SCCB_RX (34) | ||
108 | #define IRQ_SCCB_SPCOND (35) | ||
109 | #define IRQ_SCCA_TX (36) | ||
110 | #define IRQ_SCCA_STAT (37) | ||
111 | #define IRQ_SCCA_RX (38) | ||
112 | #define IRQ_SCCA_SPCOND (39) | ||
113 | #endif | ||
114 | |||
115 | /* Level 4 (PSC, AV Macs only) interrupts */ | 98 | /* Level 4 (PSC, AV Macs only) interrupts */ |
116 | #define IRQ_PSC4_0 (32) | 99 | #define IRQ_PSC4_0 (32) |
117 | #define IRQ_PSC4_1 (33) | 100 | #define IRQ_PSC4_1 (33) |
101 | #define IRQ_MAC_SCC_A IRQ_PSC4_1 | ||
118 | #define IRQ_PSC4_2 (34) | 102 | #define IRQ_PSC4_2 (34) |
103 | #define IRQ_MAC_SCC_B IRQ_PSC4_2 | ||
119 | #define IRQ_PSC4_3 (35) | 104 | #define IRQ_PSC4_3 (35) |
120 | #define IRQ_MAC_MACE_DMA IRQ_PSC4_3 | 105 | #define IRQ_MAC_MACE_DMA IRQ_PSC4_3 |
121 | 106 | ||
@@ -146,6 +131,9 @@ | |||
146 | #define IRQ_BABOON_2 (66) | 131 | #define IRQ_BABOON_2 (66) |
147 | #define IRQ_BABOON_3 (67) | 132 | #define IRQ_BABOON_3 (67) |
148 | 133 | ||
134 | /* On non-PSC machines, the serial ports share an IRQ */ | ||
135 | #define IRQ_MAC_SCC IRQ_AUTO_4 | ||
136 | |||
149 | #define SLOT2IRQ(x) (x + 47) | 137 | #define SLOT2IRQ(x) (x + 47) |
150 | #define IRQ2SLOT(x) (x - 47) | 138 | #define IRQ2SLOT(x) (x - 47) |
151 | 139 | ||