pmac-zilog, mac68k: replace mac68k SCC code with platform device
Subsystems (3)
PATCH 4/13 pmac-zilog, mac68k: replace mac68k SCC code with platform device
Remove the old 68k Mac serial port code and a lot of related cruft. Add platform driver support to the pmac-zilog driver, putting the powermac- specific bits inside #ifdef CONFIG_PPC_PMAC. Add new platform devices to mac68k.
Tested on a beige G3 PowerMac and a variety of 68k Macs.
--- arch/m68k/Kconfig | 6 arch/m68k/configs/mac_defconfig | 7 arch/m68k/configs/multi_defconfig | 6 arch/m68k/include/asm/machw.h | 25 -- arch/m68k/include/asm/macints.h | 22 -- arch/m68k/mac/Makefile | 2 arch/m68k/mac/config.c | 51 +++++ arch/m68k/mac/debug.c | 365 -------------------------------------- arch/m68k/mac/macints.c | 101 +--------- arch/m68k/mac/oss.c | 20 -- arch/m68k/mac/via.c | 7 drivers/serial/Kconfig | 12 - drivers/serial/pmac_zilog.c | 159 ++++++++++++++-- drivers/serial/pmac_zilog.h | 14 + 14 files changed, 249 insertions(+), 548 deletions(-)
drivers/serial/Kconfig +6 -6
@@ -1079,12 +1079,12 @@ config SERIAL_68360 default y config SERIAL_PMACZILOG - tristate "PowerMac z85c30 ESCC support" - depends on PPC_OF && PPC_PMAC + tristate "Mac or PowerMac z85c30 ESCC support" + depends on (M68K && MAC) || (PPC_OF && PPC_PMAC) select SERIAL_CORE help This driver supports the Zilog z85C30 serial ports found on - PowerMac machines. + (Power)Mac machines. Say Y or M if you want to be able to these serial ports. config SERIAL_PMACZILOG_TTYS
@@ -1109,16 +1109,16 @@ config SERIAL_PMACZILOG_TTYS unable to use the 8250 module for PCMCIA or other 16C550-style UARTs. - Say N unless you need the z85c30 ports on your powermac + Say N unless you need the z85c30 ports on your (Power)Mac to appear as /dev/ttySn. config SERIAL_PMACZILOG_CONSOLE - bool "Console on PowerMac z85c30 serial port" + bool "Console on Mac or PowerMac z85c30 serial port" depends on SERIAL_PMACZILOG=y select SERIAL_CORE_CONSOLE help If you would like to be able to use the z85c30 serial port - on your PowerMac as the console, you can do so by answering + on your (Power)Mac as the console, you can do so by answering Y to this option. config SERIAL_LH7A40X
arch/m68k/Kconfig +1 -5
@@ -530,10 +530,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
@@ -589,7 +585,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 || MAC || 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 +5 -2
@@ -701,6 +701,11 @@ CONFIG_VT_HW_CONSOLE_BINDING=y # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_TTYS=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y
@@ -834,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 +5 -1
@@ -822,6 +822,11 @@ CONFIG_A2232=y # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_TTYS=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y
@@ -982,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
drivers/serial/pmac_zilog.c +139 -20
284 lines not on this page · raw message
drivers/serial/pmac_zilog.h +14 -0
@@ -1,7 +1,15 @@#ifndef __PMAC_ZILOG_H__#define __PMAC_ZILOG_H__ +#ifdef CONFIG_PPC_PMAC #define pmz_debug(fmt, arg...) dev_dbg(&uap->dev->ofdev.dev, fmt, ## arg) +#define pmz_error(fmt, arg...) dev_err(&uap->dev->ofdev.dev, fmt, ## arg) +#define pmz_info(fmt, arg...) dev_info(&uap->dev->ofdev.dev, fmt, ## arg) +#else +#define pmz_debug(fmt, arg...) do { } while (0) +#define pmz_error(fmt, arg...) printk(KERN_ERR fmt, ## arg) +#define pmz_info(fmt, arg...) printk(KERN_INFO fmt, ## arg) +#endif /* * At most 2 ESCCs with 2 ports each
@@ -17,6 +25,7 @@ struct uart_pmac_port {struct uart_port port;struct uart_pmac_port *mate; +#ifdef CONFIG_PPC_PMAC /* macio_dev for the escc holding this port (maybe be null on * early inited port) */
@@ -25,6 +34,9 @@ struct uart_pmac_port {* of "escc" node (ie. ch-a or ch-b) */ struct device_node *node; +#else +struct platform_device *node; +#endif /* Port type as obtained from device tree (IRDA, modem, ...) */ int port_type;
@@ -55,10 +67,12 @@ struct uart_pmac_port {volatile u8 __iomem *control_reg;volatile u8 __iomem *data_reg; +#ifdef CONFIG_PPC_PMAC unsigned int tx_dma_irq;unsigned int rx_dma_irq;volatile struct dbdma_regs __iomem *tx_dma_regs;volatile struct dbdma_regs __iomem *rx_dma_regs; +#endif struct ktermios termios_cache; };
arch/m68k/mac/Makefile +1 -1
@@ -3,4 +3,4 @@ # obj-y := config.o macints.o iop.o via.o oss.o psc.o \ - baboon.o macboing.o debug.o misc.o + baboon.o macboing.o misc.o
arch/m68k/mac/debug.c deleted +0 -365
365 lines not on this page · raw message
arch/m68k/include/asm/machw.h +0 -25
@@ -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
@@ -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)
arch/m68k/mac/macints.c +18 -83
184 lines not on this page · raw message
arch/m68k/mac/oss.c +4 -16
@@ -33,7 +33,6 @@ static irqreturn_t oss_irq(int, void *);static irqreturn_t oss_nubus_irq (int ,void *);extern irqreturn_t via1_irq (int ,void *); -extern irqreturn_t mac_scc_dispatch (int ,void *);/* * Initialize the OSS
@@ -69,9 +68,6 @@ void __init oss_register_interrupts(voidif (request_irq (OSS_IRQLEV_SCSI , oss_irq,IRQ_FLG_LOCK ,"scsi" , (void *) oss))pr_err ("Couldn't register %s interrupt\n" ,"scsi" ); -if (request_irq (OSS_IRQLEV_IOPSCC , mac_scc_dispatch,IRQ_FLG_LOCK , -"scc" , mac_scc_dispatch)) -pr_err ("Couldn't register %s interrupt\n" ,"scc" );if (request_irq (OSS_IRQLEV_NUBUS , oss_nubus_irq,IRQ_FLG_LOCK ,"nubus" , (void *) oss))pr_err ("Couldn't register %s interrupt\n" ,"nubus" );
@@ -172,9 +168,7 @@ void oss_irq_enable(int irq) {printk ("oss_irq_enable(%d)\n" , irq);#endif switch (irq) { -case IRQ_SCC : -case IRQ_SCCA : -case IRQ_SCCB : +case IRQ_MAC_SCC : oss->irq_level[OSS_IOPSCC ] =OSS_IRQLEV_IOPSCC ;break ;case IRQ_MAC_ADB :
@@ -212,9 +206,7 @@ void oss_irq_disable(int irq) {printk ("oss_irq_disable(%d)\n" , irq);#endif switch (irq) { -case IRQ_SCC : -case IRQ_SCCA : -case IRQ_SCCB : +case IRQ_MAC_SCC : oss->irq_level[OSS_IOPSCC ] =OSS_IRQLEV_DISABLED ;break ;case IRQ_MAC_ADB :
@@ -250,9 +242,7 @@ void oss_irq_disable(int irq) {void oss_irq_clear (int irq) {/* FIXME: how to do this on OSS? */ switch (irq) { -case IRQ_SCC : -case IRQ_SCCA : -case IRQ_SCCB : +case IRQ_MAC_SCC : oss->irq_pending &= ~OSS_IP_IOPSCC ;break ;case IRQ_MAC_ADB :
@@ -280,9 +270,7 @@ void oss_irq_clear(int irq) {int oss_irq_pending (int irq) {switch (irq) { -case IRQ_SCC : -case IRQ_SCCA : -case IRQ_SCCB : +case IRQ_MAC_SCC :return oss->irq_pending &OSS_IP_IOPSCC ;break ;case IRQ_MAC_ADB :
arch/m68k/mac/via.c +0 -7
@@ -84,8 +84,6 @@ void via_irq_enable(int irq);void via_irq_disable (int irq);void via_irq_clear (int irq); -extern irqreturn_t mac_scc_dispatch (int ,void *); -/* * Initialize the VIAs *
@@ -311,11 +309,6 @@ void __init via_register_interrupts(voidif (request_irq (IRQ_AUTO_2 , via2_irq,IRQ_FLG_LOCK |IRQ_FLG_FAST ,"via2" , (void *) via2))pr_err ("Couldn't register %s interrupt\n" ,"via2" ); -if (!psc_present) { -if (request_irq (IRQ_AUTO_4 , mac_scc_dispatch,IRQ_FLG_LOCK , -"scc" , mac_scc_dispatch)) -pr_err ("Couldn't register %s interrupt\n" ,"scc" ); - }if (request_irq (IRQ_MAC_NUBUS , via_nubus_irq,IRQ_FLG_LOCK |IRQ_FLG_FAST ,"nubus" , (void *) via2))pr_err ("Couldn't register %s interrupt\n" ,"nubus" );
arch/m68k/mac/config.c +51 -0
69 lines not on this page · raw message
Quoted 8 lines · Finn Thain
Remove the old 68k Mac serial port code and a lot of related cruft. Add platform driver support to the pmac-zilog driver, putting the powermac- specific bits inside #ifdef
CONFIG_PPC_PMAC. Add new platform devices to mac68k.Tested on a beige G3 PowerMac and a variety of 68k Macs.
Signed-off-by Finn Thain <[email protected]>
Can you split that patch into one that adds the pmac_zilog bit, and a separate one that then removes the old m68k stuff ?
Cheers,
Ben.