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>

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 @@
 #define VIDEOMEMSIZE    (4096*1024)
 #define VIDEOMEMMASK    (-4096*1024)
 
-#ifndef __ASSEMBLY__
-
-#include <linux/types.h>
-
-#if 0
-/*
-** SCC Z8530
-*/
-
-#define MAC_SCC_BAS (0x50F04000)
-struct MAC_SCC
- {
-  u_char cha_a_ctrl;
-  u_char char_dummy1;
-  u_char cha_a_data;
-  u_char char_dummy2;
-  u_char cha_b_ctrl;
-  u_char char_dummy3;
-  u_char cha_b_data;
- };
-# define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS))
-#endif
-
-#endif /* __ASSEMBLY__ */
-
 #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 @@
 
 #define VIA1_SOURCE_BASE        8
 #define VIA2_SOURCE_BASE        16
-#define MAC_SCC_SOURCE_BASE     24
 #define PSC3_SOURCE_BASE        24
 #define PSC4_SOURCE_BASE        32
 #define PSC5_SOURCE_BASE        40
@@ -96,26 +95,12 @@
 #define IRQ_PSC3_2        (26)
 #define IRQ_PSC3_3        (27)
 
-/* Level 4 (SCC) interrupts */
-#define IRQ_SCC              (32)
-#define IRQ_SCCA             (33)
-#define IRQ_SCCB             (34)
-#if 0 /* FIXME: are there multiple interrupt conditions on the SCC ?? */
-/* SCC interrupts */
-#define IRQ_SCCB_TX          (32)
-#define IRQ_SCCB_STAT        (33)
-#define IRQ_SCCB_RX          (34)
-#define IRQ_SCCB_SPCOND      (35)
-#define IRQ_SCCA_TX          (36)
-#define IRQ_SCCA_STAT        (37)
-#define IRQ_SCCA_RX          (38)
-#define IRQ_SCCA_SPCOND      (39)
-#endif
-
 /* Level 4 (PSC, AV Macs only) interrupts */
 #define IRQ_PSC4_0        (32)
 #define IRQ_PSC4_1        (33)
+#define IRQ_MAC_SCC_A     IRQ_PSC4_1
 #define IRQ_PSC4_2        (34)
+#define IRQ_MAC_SCC_B     IRQ_PSC4_2
 #define IRQ_PSC4_3        (35)
 #define IRQ_MAC_MACE_DMA  IRQ_PSC4_3
 
@@ -146,6 +131,9 @@
 #define IRQ_BABOON_2      (66)
 #define IRQ_BABOON_3      (67)
 
+/* On non-PSC machines, the serial ports share an IRQ */
+#define IRQ_MAC_SCC       IRQ_AUTO_4
+
 #define SLOT2IRQ(x)       (x + 47)
 #define IRQ2SLOT(x)       (x - 47)