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

Commit b497549a authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C24XX: Split serial driver into core and per-cpu drivers 



The S3C2410 serial driver in drivers/serial/s3c2410.c has been
growing bigger with the addition of more variants of this hardware
with the growing Samsung SoCs range. As such, it would be
easier to split this code up into a core and per-cpu drivers to
make driver addition easier, and the core smaller.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 6fc601e3

arch/arm/configs/s3c2410_defconfig

+12 −3
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.26-rc8

# Wed Jun 25 13:39:12 2008

# Thu Jul  3 11:48:41 2008

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -12,6 +12,7 @@ CONFIG_MMU=y 
CONFIG_NO_IOPORT=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

CONFIG_HARDIRQS_SW_RESEND=y
@@ -23,6 +24,7 @@ CONFIG_GENERIC_HWEIGHT=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_SUPPORTS_AOUT=y

CONFIG_ZONE_DMA=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -131,7 +133,6 @@ CONFIG_CLASSIC_RCU=y 
# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS7500 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set
@@ -145,8 +146,11 @@ CONFIG_CLASSIC_RCU=y 
# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_PNX4008 is not set
@@ -871,8 +875,12 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y 
#

# Non-8250 serial port support

#

CONFIG_SERIAL_SAMSUNG=y

# CONFIG_SERIAL_SAMSUNG_DEBUG is not set

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_SERIAL_S3C2410=y

CONFIG_SERIAL_S3C2410_CONSOLE=y

CONFIG_SERIAL_S3C2412=y

CONFIG_SERIAL_S3C2440=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_UNIX98_PTYS=y
@@ -1544,6 +1552,7 @@ CONFIG_FRAME_POINTER=y 
# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

# CONFIG_SAMPLES is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

drivers/serial/Kconfig

+45 −9
Original line number Diff line number Diff line
@@ -448,22 +448,27 @@ config SERIAL_CLPS711X_CONSOLE 
	  your boot loader (lilo or loadlin) about how to pass options to the

	  kernel at boot time.)



config SERIAL_S3C2410

	tristate "Samsung S3C2410/S3C2440/S3C2442/S3C2412 Serial port support"

	depends on ARM && ARCH_S3C2410

	select SERIAL_CORE

config SERIAL_SAMSUNG

	tristate "Samsung SoC serial support"

	depends on ARM && PLAT_S3C24XX

	help

	  Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,

	  providing /dev/ttySAC0, 1 and 2 (note, some machines may not

	  provide all of these ports, depending on how the serial port

	  pins are configured.



	  Currently this driver supports the UARTS on the S3C2410, S3C2440,

	  S3C2442, S3C2412 and S3C2413 CPUs.

config SERIAL_SAMSUNG_DEBUG

	bool "Samsung SoC serial debug"

	depends on SERIAL_SAMSUNG

	help

	  Add support for debugging the serial driver. Since this is

	  generally being used as a console, we use our own output

	  routines that go via the low-level debug printascii()

	  function.



config SERIAL_S3C2410_CONSOLE

	bool "Support for console on S3C2410 serial port"

	depends on SERIAL_S3C2410=y

config SERIAL_SAMSUNG_CONSOLE

	bool "Support for console on Samsung SoC serial port"

	depends on SERIAL_SAMSUNG=y

	select SERIAL_CORE_CONSOLE

	help

	  Allow selection of the S3C24XX on-board serial ports for use as
@@ -476,6 +481,37 @@ config SERIAL_S3C2410_CONSOLE 
	  your boot loader about how to pass options to the kernel at

	  boot time.)



config SERIAL_S3C2400

	tristate "Samsung S3C2410 Serial port support"

	depends on ARM && SERIAL_SAMSUNG && CPU_S3C2400

	default y if CPU_S3C2400

	help

	  Serial port support for the Samsung S3C2400 SoC



config SERIAL_S3C2410

	tristate "Samsung S3C2410 Serial port support"

	depends on SERIAL_SAMSUNG && CPU_S3C2410

	default y if CPU_S3C2410

	help

	  Serial port support for the Samsung S3C2410 SoC



config SERIAL_S3C2412

	tristate "Samsung S3C2412/S3C2413 Serial port support"

	depends on SERIAL_SAMSUNG && CPU_S3C2412

	default y if CPU_S3C2412

	help

	  Serial port support for the Samsung S3C2412 and S3C2413 SoC



config SERIAL_S3C2440

	tristate "Samsung S3C2440/S3C2442 Serial port support"

	depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442)

	default y if CPU_S3C2440

	default y if CPU_S3C2442

	help

	  Serial port support for the Samsung S3C2440 and S3C2442 SoC







config SERIAL_DZ

	bool "DECstation DZ serial driver"

	depends on MACH_DECSTATION && 32BIT

drivers/serial/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -28,7 +28,11 @@ obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o 
obj-$(CONFIG_SERIAL_SA1100) += sa1100.o

obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o

obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o

obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o

obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.o

obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o

obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o

obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o

obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o

obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o

obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o

drivers/serial/s3c2400.c

0 → 100644
+106 −0
Original line number Diff line number Diff line 
/* linux/drivers/serial/s3c240.c

 *

 * Driver for Samsung SoC onboard UARTs.

 *

 * Ben Dooks, Copyright (c) 2003-2005 Simtec Electronics

 *	http://armlinux.simtec.co.uk/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <linux/module.h>

#include <linux/ioport.h>

#include <linux/io.h>

#include <linux/platform_device.h>



#include <asm/irq.h>



#include <asm/hardware.h>



#include <asm/plat-s3c/regs-serial.h>

#include <asm/arch/regs-gpio.h>



#include "samsung.h"



static int s3c2400_serial_getsource(struct uart_port *port,

				    struct s3c24xx_uart_clksrc *clk)

{

	clk->divisor = 1;

	clk->name = "pclk";



	return 0;

}



static int s3c2400_serial_setsource(struct uart_port *port,

				    struct s3c24xx_uart_clksrc *clk)

{

	return 0;

}



static int s3c2400_serial_resetport(struct uart_port *port,

				    struct s3c2410_uartcfg *cfg)

{

	dbg("s3c2400_serial_resetport: port=%p (%08lx), cfg=%p\n",

	    port, port->mapbase, cfg);



	wr_regl(port, S3C2410_UCON,  cfg->ucon);

	wr_regl(port, S3C2410_ULCON, cfg->ulcon);



	/* reset both fifos */



	wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);

	wr_regl(port, S3C2410_UFCON, cfg->ufcon);



	return 0;

}



static struct s3c24xx_uart_info s3c2400_uart_inf = {

	.name		= "Samsung S3C2400 UART",

	.type		= PORT_S3C2400,

	.fifosize	= 16,

	.rx_fifomask	= S3C2410_UFSTAT_RXMASK,

	.rx_fifoshift	= S3C2410_UFSTAT_RXSHIFT,

	.rx_fifofull	= S3C2410_UFSTAT_RXFULL,

	.tx_fifofull	= S3C2410_UFSTAT_TXFULL,

	.tx_fifomask	= S3C2410_UFSTAT_TXMASK,

	.tx_fifoshift	= S3C2410_UFSTAT_TXSHIFT,

	.get_clksrc	= s3c2400_serial_getsource,

	.set_clksrc	= s3c2400_serial_setsource,

	.reset_port	= s3c2400_serial_resetport,

};



static int s3c2400_serial_probe(struct platform_device *dev)

{

	return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);

}



static struct platform_driver s3c2400_serial_drv = {

	.probe		= s3c2400_serial_probe,

	.remove		= s3c24xx_serial_remove,

	.driver		= {

		.name	= "s3c2400-uart",

		.owner	= THIS_MODULE,

	},

};



s3c24xx_console_init(&s3c2400_serial_drv, &s3c2400_uart_inf);



static inline int s3c2400_serial_init(void)

{

	return s3c24xx_serial_init(&s3c2400_serial_drv, &s3c2400_uart_inf);

}



static inline void s3c2400_serial_exit(void)

{

	platform_driver_unregister(&s3c2400_serial_drv);

}



module_init(s3c2400_serial_init);

module_exit(s3c2400_serial_exit);



MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");

MODULE_DESCRIPTION("Samsung S3C2400 SoC Serial port driver");

MODULE_ALIAS("platform:s3c2400-uart");

drivers/serial/s3c2410.c

+21 −1833

File changed.

Preview size limit exceeded, changes collapsed.