Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80614e5a authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

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: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent ec9cbe09

arch/m68k/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -536,10 +536,6 @@ config GVPIOEXT_PLIP 
	  Say Y to enable doing IP over the parallel port on your GVP

	  IO-Extender card, N otherwise.



config MAC_SCC

	tristate "Macintosh serial support"

	depends on MAC



config MAC_HID

	bool

	depends on INPUT_ADBHID
@@ -595,7 +591,7 @@ config DN_SERIAL 


config SERIAL_CONSOLE

	bool "Support for serial port console"

	depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)

	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)

	---help---

	  If you say Y here, it will be possible to use a serial port as the

	  system console (the system console is the device which receives all

arch/m68k/configs/mac_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -839,9 +839,7 @@ CONFIG_HIDRAW=y 
#

# Character devices

#

CONFIG_MAC_SCC=y

CONFIG_MAC_HID=y

CONFIG_SERIAL_CONSOLE=y



#

# File systems

arch/m68k/configs/multi_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -987,7 +987,6 @@ CONFIG_ATARI_MIDI=y 
CONFIG_ATARI_DSP56K=m

CONFIG_AMIGA_BUILTIN_SERIAL=y

CONFIG_MULTIFACE_III_TTY=m

CONFIG_MAC_SCC=y

CONFIG_MAC_HID=y

CONFIG_MVME147_SCC=y

CONFIG_SERIAL167=y

arch/m68k/include/asm/machw.h

+0 −25
Original line number Diff line number Diff line
@@ -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 */

arch/m68k/include/asm/macints.h

+5 −17
Original line number Diff line number Diff line
@@ -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)