Commit ecd6bf67 authored by Mark Greer's avatar Mark Greer Committed by Greg Kroah-Hartman
Browse files

serial: mpsc: Remove obsolete MPSC driver 



Support for the Marvell MV64x60 line of bridge chips that contained
MPSC controllers has been removed and there are no other components
that have that controller so remove its driver.

Signed-off-by: default avatarMark Greer <mgreer@animalcreek.com>
Link: https://lore.kernel.org/r/20190626160553.28518-1-mgreer@animalcreek.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7a8f766

Documentation/admin-guide/devices.txt

+2 −2
Original line number Diff line number Diff line
@@ -2693,8 +2693,8 @@ 
		 41 = /dev/ttySMX0		Motorola i.MX - port 0

		 42 = /dev/ttySMX1		Motorola i.MX - port 1

		 43 = /dev/ttySMX2		Motorola i.MX - port 2

		 44 = /dev/ttyMM0		Marvell MPSC - port 0

		 45 = /dev/ttyMM1		Marvell MPSC - port 1

		 44 = /dev/ttyMM0		Marvell MPSC - port 0 (obsolete unused)

		 45 = /dev/ttyMM1		Marvell MPSC - port 1 (obsolete unused)

		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0

		    ...

		 47 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5

drivers/tty/serial/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -457,20 +457,6 @@ config SERIAL_21285_CONSOLE 
	  your boot loader (lilo or loadlin) about how to pass options to the

	  kernel at boot time.)



config SERIAL_MPSC

	bool "Marvell MPSC serial port support"

	depends on MV64X60

	select SERIAL_CORE

	help

	  Say Y here if you want to use the Marvell MPSC serial controller.



config SERIAL_MPSC_CONSOLE

	bool "Support for console on Marvell MPSC serial port"

	depends on SERIAL_MPSC

	select SERIAL_CORE_CONSOLE

	help

	  Say Y here if you want to support a serial console on a Marvell MPSC.



config SERIAL_PXA

	bool "PXA serial port support (DEPRECATED)"

	depends on ARCH_PXA || ARCH_MMP

drivers/tty/serial/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ obj-$(CONFIG_SERIAL_CPM) += cpm_uart/ 
obj-$(CONFIG_SERIAL_IMX) += imx.o

obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_uart.o

obj-$(CONFIG_SERIAL_ICOM) += icom.o

obj-$(CONFIG_SERIAL_MPSC) += mpsc.o

obj-$(CONFIG_SERIAL_MESON) += meson_uart.o

obj-$(CONFIG_SERIAL_SB1250_DUART) += sb1250-duart.o

obj-$(CONFIG_SERIAL_SCCNXP) += sccnxp.o

drivers/tty/serial/mpsc.c

deleted100644 → 0
+0 −2138

File deleted.

Preview size limit exceeded, changes collapsed.

include/linux/mv643xx.h

+0 −46
Original line number Diff line number Diff line
@@ -918,52 +918,6 @@ 


extern void mv64340_irq_init(unsigned int base);



/* MPSC Platform Device, Driver Data (Shared register regions) */

#define	MPSC_SHARED_NAME		"mpsc_shared"



#define	MPSC_ROUTING_BASE_ORDER		0

#define	MPSC_SDMA_INTR_BASE_ORDER	1



#define MPSC_ROUTING_REG_BLOCK_SIZE	0x000c

#define MPSC_SDMA_INTR_REG_BLOCK_SIZE	0x0084



struct mpsc_shared_pdata {

	u32	mrr_val;

	u32	rcrr_val;

	u32	tcrr_val;

	u32	intr_cause_val;

	u32	intr_mask_val;

};



/* MPSC Platform Device, Driver Data */

#define	MPSC_CTLR_NAME			"mpsc"



#define	MPSC_BASE_ORDER			0

#define	MPSC_SDMA_BASE_ORDER		1

#define	MPSC_BRG_BASE_ORDER		2



#define MPSC_REG_BLOCK_SIZE		0x0038

#define MPSC_SDMA_REG_BLOCK_SIZE	0x0c18

#define MPSC_BRG_REG_BLOCK_SIZE		0x0008



struct mpsc_pdata {

	u8	mirror_regs;

	u8	cache_mgmt;

	u8	max_idle;

	int	default_baud;

	int	default_bits;

	int	default_parity;

	int	default_flow;

	u32	chr_1_val;

	u32	chr_2_val;

	u32	chr_10_val;

	u32	mpcr_val;

	u32	bcr_val;

	u8	brg_can_tune;

	u8	brg_clk_src;

	u32	brg_clk_freq;

};



/* Watchdog Platform Device, Driver Data */

#define	MV64x60_WDT_NAME			"mv64x60_wdt"