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

Commit 335bd9df authored by Ralf Baechle's avatar Ralf Baechle Committed by Russell King
Browse files

[SERIAL] Remove obsoleted au1x00_uart driver 



As announced in feature-removal-schedule.txt.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8faaea3f

arch/mips/au1000/common/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ void __init plat_setup(void) 




	argptr = prom_getcmdline();

	argptr = prom_getcmdline();





#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)

#ifdef CONFIG_SERIAL_8250_CONSOLE

	if ((argptr = strstr(argptr, "console=")) == NULL) {

	if ((argptr = strstr(argptr, "console=")) == NULL) {

		argptr = prom_getcmdline();

		argptr = prom_getcmdline();

		strcat(argptr, " console=ttyS0,115200");

		strcat(argptr, " console=ttyS0,115200");

drivers/serial/Kconfig

+0 −16
Original line number Original line Diff line number Diff line
@@ -620,22 +620,6 @@ config SERIAL_SH_SCI_CONSOLE 
	depends on SERIAL_SH_SCI=y

	depends on SERIAL_SH_SCI=y

	select SERIAL_CORE_CONSOLE

	select SERIAL_CORE_CONSOLE





config SERIAL_AU1X00

	bool "Enable Au1x00 UART Support"

	depends on MIPS && SOC_AU1X00

	select SERIAL_CORE

	help

	  If you have an Alchemy AU1X00 processor (MIPS based) and you want

	  to use serial ports, say Y.  Otherwise, say N.



config SERIAL_AU1X00_CONSOLE

	bool "Enable Au1x00 serial console"

	depends on SERIAL_AU1X00

	select SERIAL_CORE_CONSOLE

	help

	  If you have an Alchemy AU1X00 processor (MIPS based) and you want

	  to use a console on a serial port, say Y.  Otherwise, say N.



config SERIAL_CORE

config SERIAL_CORE

	tristate

	tristate

drivers/serial/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o 
obj-$(CONFIG_V850E_UART) += v850e_uart.o

obj-$(CONFIG_V850E_UART) += v850e_uart.o

obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o

obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o

obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o

obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o

obj-$(CONFIG_SERIAL_AU1X00) += au1x00_uart.o

obj-$(CONFIG_SERIAL_DZ) += dz.o

obj-$(CONFIG_SERIAL_DZ) += dz.o

obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o

obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o

obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o

obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o

drivers/serial/au1x00_uart.c

deleted100644 → 0
+0 −1287

File deleted.

Preview size limit exceeded, changes collapsed.

include/asm-mips/serial.h

+1 −84
Original line number Original line Diff line number Diff line
@@ -103,88 +103,6 @@ 
#define IVR_SERIAL_PORT_DEFNS

#define IVR_SERIAL_PORT_DEFNS

#endif

#endif





#ifdef CONFIG_SERIAL_AU1X00

#include <asm/mach-au1x00/au1000.h>

#ifdef CONFIG_SOC_AU1000

#define AU1000_SERIAL_PORT_DEFNS                       \

    { .baud_base = 0, .port = UART0_ADDR,              \

      .iomem_base = (unsigned char *)UART0_ADDR,       \

      .irq = AU1000_UART0_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART1_ADDR,              \

      .iomem_base = (unsigned char *)UART1_ADDR,       \

      .irq = AU1000_UART1_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART2_ADDR,              \

      .iomem_base = (unsigned char *)UART2_ADDR,       \

      .irq = AU1000_UART2_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART3_ADDR,              \

      .iomem_base = (unsigned char *)UART3_ADDR,       \

      .irq = AU1000_UART3_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },

#endif



#ifdef CONFIG_SOC_AU1500

#define AU1000_SERIAL_PORT_DEFNS                       \

    { .baud_base = 0, .port = UART0_ADDR,              \

      .iomem_base = (unsigned char *)UART0_ADDR,       \

      .irq = AU1500_UART0_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART3_ADDR,              \

      .iomem_base = (unsigned char *)UART3_ADDR,       \

      .irq = AU1500_UART3_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },

#endif



#ifdef CONFIG_SOC_AU1100

#define AU1000_SERIAL_PORT_DEFNS                       \

    { .baud_base = 0, .port = UART0_ADDR,              \

      .iomem_base = (unsigned char *)UART0_ADDR,       \

      .irq = AU1100_UART0_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART1_ADDR,              \

      .iomem_base = (unsigned char *)UART1_ADDR,       \

      .irq = AU1100_UART1_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART3_ADDR,              \

      .iomem_base = (unsigned char *)UART3_ADDR,       \

      .irq = AU1100_UART3_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },

#endif



#ifdef CONFIG_SOC_AU1550

#define AU1000_SERIAL_PORT_DEFNS                       \

    { .baud_base = 0, .port = UART0_ADDR,              \

      .iomem_base = (unsigned char *)UART0_ADDR,       \

      .irq = AU1550_UART0_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART1_ADDR,              \

      .iomem_base = (unsigned char *)UART1_ADDR,       \

      .irq = AU1550_UART1_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART3_ADDR,              \

      .iomem_base = (unsigned char *)UART3_ADDR,       \

      .irq = AU1550_UART3_INT,  .flags = STD_COM_FLAGS,\

      .iomem_reg_shift = 2 },

#endif



#ifdef CONFIG_SOC_AU1200

#define AU1000_SERIAL_PORT_DEFNS                       \

    { .baud_base = 0, .port = UART0_ADDR,              \

      .iomem_base = (unsigned char *)UART0_ADDR,       \

      .irq = AU1200_UART0_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },                          \

    { .baud_base = 0, .port = UART1_ADDR,              \

      .iomem_base = (unsigned char *)UART1_ADDR,       \

      .irq = AU1200_UART1_INT, .flags = STD_COM_FLAGS, \

      .iomem_reg_shift = 2 },

#endif



#else

#define AU1000_SERIAL_PORT_DEFNS

#endif



#ifdef CONFIG_HAVE_STD_PC_SERIAL_PORT

#ifdef CONFIG_HAVE_STD_PC_SERIAL_PORT

#define STD_SERIAL_PORT_DEFNS			\

#define STD_SERIAL_PORT_DEFNS			\

	/* UART CLK   PORT IRQ     FLAGS        */			\

	/* UART CLK   PORT IRQ     FLAGS        */			\
@@ -331,7 +249,6 @@ 
	MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS		\

	MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS		\

	MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS		\

	MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS		\

	MOMENCO_OCELOT_SERIAL_PORT_DEFNS		\

	MOMENCO_OCELOT_SERIAL_PORT_DEFNS		\

	MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS		\

	MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS

	AU1000_SERIAL_PORT_DEFNS





#endif /* _ASM_SERIAL_H */
 
#endif /* _ASM_SERIAL_H */