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

Commit 02f11f39 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

coldfire: scheduled SERIAL_COLDFIRE removal 



This patch contains the scheduled removal of the obsolete
SERIAL_COLDFIRE driver.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2571cd6a

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -287,14 +287,6 @@ Who: Glauber Costa <gcosta@redhat.com> 


---------------------------



What:	old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)

When:	2.6.28

Why:	This driver still uses the old interface and has been replaced

	by CONFIG_SERIAL_MCF.

Who:	Sebastian Siewior <sebastian@breakpoint.cc>



---------------------------



What:	/sys/o2cb symlink

When:	January 2010

Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb

drivers/serial/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -994,24 +994,12 @@ config SERIAL_68328_RTS_CTS 
	bool "Support RTS/CTS on 68328 serial port"

	depends on SERIAL_68328



config SERIAL_COLDFIRE

	bool "ColdFire serial support (DEPRECATED)"

	depends on COLDFIRE

	help

	  This driver supports the built-in serial ports of the Motorola ColdFire

	  family of CPUs.

	  This driver is deprecated because it supports only the old interface

	  for serial drivers and features like magic keys are not working.

	  Please switch to the new style driver because this driver will be

	  removed soon.



config SERIAL_MCF

	bool "Coldfire serial support (new style driver)"

	bool "Coldfire serial support"

	depends on COLDFIRE

	select SERIAL_CORE

	help

	  This new serial driver supports the Freescale Coldfire serial ports

	  using the new serial driver subsystem.

	  This serial driver supports the Freescale Coldfire serial ports.



config SERIAL_MCF_BAUDRATE

	int "Default baudrate for Coldfire serial ports"

drivers/serial/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o 
obj-$(CONFIG_SERIAL_MUX) += mux.o

obj-$(CONFIG_SERIAL_68328) += 68328serial.o

obj-$(CONFIG_SERIAL_68360) += 68360serial.o

obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o

obj-$(CONFIG_SERIAL_MCF) += mcf.o

obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o

obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o

drivers/serial/mcfserial.c

deleted100644 → 0
+0 −1965

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/serial/mcfserial.h

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
/*

 * mcfserial.c -- serial driver for ColdFire internal UARTS.

 *

 * Copyright (c) 1999 Greg Ungerer <gerg@snapgear.com>

 * Copyright (c) 2000-2001 Lineo, Inc. <www.lineo.com>

 * Copyright (c) 2002 SnapGear Inc., <www.snapgear.com>

 *

 * Based on code from 68332serial.c which was:

 *

 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1998 TSHG

 * Copyright (c) 1999 Rt-Control Inc. <jeff@uclinux.org>

 */ 

#ifndef _MCF_SERIAL_H

#define _MCF_SERIAL_H



#include <linux/serial.h>



#ifdef __KERNEL__



/*

 *	Define a local serial stats structure.

 */



struct mcf_stats {

	unsigned int	rx;

	unsigned int	tx;

	unsigned int	rxbreak;

	unsigned int	rxframing;

	unsigned int	rxparity;

	unsigned int	rxoverrun;

};





/*

 * This is our internal structure for each serial port's state.

 * Each serial port has one of these structures associated with it.

 */



struct mcf_serial {

	int			magic;

	volatile unsigned char	*addr;		/* UART memory address */

	int			irq;

	int			flags; 		/* defined in tty.h */

	int			type; 		/* UART type */

	struct tty_struct 	*tty;

	unsigned char		imr;		/* Software imr register */

	unsigned int		baud;

	int			sigs;

	int			custom_divisor;

	int			x_char;	/* xon/xoff character */

	int			baud_base;

	int			close_delay;

	unsigned short		closing_wait;

	unsigned short		closing_wait2;

	unsigned long		event;

	int			line;

	int			count;	    /* # of fd on device */

	int			blocked_open; /* # of blocked opens */

	unsigned char 		*xmit_buf;

	int			xmit_head;

	int			xmit_tail;

	int			xmit_cnt;

	struct mcf_stats	stats;

	struct work_struct	tqueue;

	struct work_struct	tqueue_hangup;

	wait_queue_head_t	open_wait;

	wait_queue_head_t	close_wait;



};



#endif /* __KERNEL__ */



#endif /* _MCF_SERIAL_H */