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

Commit da121506 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

serial: samsung: merge probe() function from all SoC specific extensions 



With reset port, set clock and get clock functions in SoC specific extentions
being removed, only the driver probe is left over in these extensions. The
probe function itself can be merged into one and moved into the samsung common
serial driver. With driver probe also moved, all the SoC specific extentions
are no longer required and they are deleted.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0dfb3b41

arch/arm/plat-samsung/include/plat/regs-serial.h

+12 −0
Original line number Diff line number Diff line
@@ -232,6 +232,18 @@ 
#define S3C2410_UCON_CLKSEL2	(1 << 2)

#define S3C2410_UCON_CLKSEL3	(1 << 3)



/* Default values for s5pv210 UCON and UFCON uart registers */

#define S5PV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\

				 S3C2410_UCON_RXILEVEL |	\

				 S3C2410_UCON_TXIRQMODE |	\

				 S3C2410_UCON_RXIRQMODE |	\

				 S3C2410_UCON_RXFIFO_TOI |	\

				 S3C2443_UCON_RXERR_IRQEN)



#define S5PV210_UFCON_DEFAULT	(S3C2410_UFCON_FIFOMODE |	\

				 S5PV210_UFCON_TXTRIG4 |	\

				 S5PV210_UFCON_RXTRIG4)



#ifndef __ASSEMBLY__



/* configuration structure for per-machine configurations for the

drivers/tty/serial/Kconfig

+2 −43
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ config SERIAL_SAMSUNG 
config SERIAL_SAMSUNG_UARTS_4

	bool

	depends on ARM && PLAT_SAMSUNG

	default y if CPU_S3C2443

	default y if !(CPU_S3C2410 || SERIAL_S3C2412 || CPU_S3C2440 || CPU_S3C2442)

	help

	  Internal node for the common case of 4 Samsung compatible UARTs
@@ -465,7 +465,7 @@ config SERIAL_SAMSUNG_UARTS 
	int

	depends on ARM && PLAT_SAMSUNG

	default 6 if ARCH_S5P6450

	default 4 if SERIAL_SAMSUNG_UARTS_4

	default 4 if SERIAL_SAMSUNG_UARTS_4 || CPU_S3C2416

	default 3

	help

	  Select the number of available UART ports for the Samsung S3C
@@ -495,47 +495,6 @@ config SERIAL_SAMSUNG_CONSOLE 
	  your boot loader about how to pass options to the kernel at

	  boot time.)



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/S3C2416 Serial port support"

	depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442 || CPU_S3C2416)

	default y if CPU_S3C2440

	default y if CPU_S3C2442

	select SERIAL_SAMSUNG_UARTS_4 if CPU_S3C2416

	help

	  Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC



config SERIAL_S3C6400

	tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"

	depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)

	select SERIAL_SAMSUNG_UARTS_4

	default y

	help

	  Serial port support for the Samsung S3C6400, S3C6410, S5P6440, S5P6450

	  and S5PC100 SoCs



config SERIAL_S5PV210

	tristate "Samsung S5PV210 Serial port support"

	depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)

	select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)

	default y

	help

	  Serial port support for Samsung's S5P Family of SoC's





config SERIAL_MAX3100

	tristate "MAX3100 support"

	depends on SPI

drivers/tty/serial/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o 
obj-$(CONFIG_SERIAL_BFIN) += bfin_uart.o

obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o

obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o

obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o

obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o

obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o

obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o

obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o

obj-$(CONFIG_SERIAL_MAX3100) += max3100.o

obj-$(CONFIG_SERIAL_MAX3107) += max3107.o

obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o

drivers/tty/serial/s3c2410.c

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

 * Driver for Samsung S3C2410 SoC onboard UARTs.

 *

 * Ben Dooks, Copyright (c) 2003-2008 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 <linux/init.h>

#include <linux/serial_core.h>

#include <linux/serial.h>



#include <asm/irq.h>

#include <mach/hardware.h>



#include <plat/regs-serial.h>

#include <mach/regs-gpio.h>



#include "samsung.h"



static struct s3c24xx_uart_info s3c2410_uart_inf = {

	.name		= "Samsung S3C2410 UART",

	.type		= PORT_S3C2410,

	.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,

	.def_clk_sel	= S3C2410_UCON_CLKSEL0,

	.num_clks	= 2,

	.clksel_mask	= S3C2410_UCON_CLKMASK,

	.clksel_shift	= S3C2410_UCON_CLKSHIFT,

};



static int s3c2410_serial_probe(struct platform_device *dev)

{

	return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);

}



static struct platform_driver s3c2410_serial_driver = {

	.probe		= s3c2410_serial_probe,

	.remove		= __devexit_p(s3c24xx_serial_remove),

	.driver		= {

		.name	= "s3c2410-uart",

		.owner	= THIS_MODULE,

	},

};



static int __init s3c2410_serial_init(void)

{

	return s3c24xx_serial_init(&s3c2410_serial_driver, &s3c2410_uart_inf);

}



static void __exit s3c2410_serial_exit(void)

{

	platform_driver_unregister(&s3c2410_serial_driver);

}



module_init(s3c2410_serial_init);

module_exit(s3c2410_serial_exit);



MODULE_LICENSE("GPL v2");

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

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

MODULE_ALIAS("platform:s3c2410-uart");

drivers/tty/serial/s3c2412.c

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

 * Driver for Samsung S3C2412 and S3C2413 SoC onboard UARTs.

 *

 * Ben Dooks, Copyright (c) 2003-2008 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 <linux/init.h>

#include <linux/serial_core.h>

#include <linux/serial.h>



#include <asm/irq.h>

#include <mach/hardware.h>



#include <plat/regs-serial.h>

#include <mach/regs-gpio.h>



#include "samsung.h"



static struct s3c24xx_uart_info s3c2412_uart_inf = {

	.name		= "Samsung S3C2412 UART",

	.type		= PORT_S3C2412,

	.fifosize	= 64,

	.has_divslot	= 1,

	.rx_fifomask	= S3C2440_UFSTAT_RXMASK,

	.rx_fifoshift	= S3C2440_UFSTAT_RXSHIFT,

	.rx_fifofull	= S3C2440_UFSTAT_RXFULL,

	.tx_fifofull	= S3C2440_UFSTAT_TXFULL,

	.tx_fifomask	= S3C2440_UFSTAT_TXMASK,

	.tx_fifoshift	= S3C2440_UFSTAT_TXSHIFT,

	.def_clk_sel	= S3C2410_UCON_CLKSEL2,

	.num_clks	= 4,

	.clksel_mask	= S3C2412_UCON_CLKMASK,

	.clksel_shift	= S3C2412_UCON_CLKSHIFT,

};



/* device management */



static int s3c2412_serial_probe(struct platform_device *dev)

{

	dbg("s3c2440_serial_probe: dev=%p\n", dev);

	return s3c24xx_serial_probe(dev, &s3c2412_uart_inf);

}



static struct platform_driver s3c2412_serial_driver = {

	.probe		= s3c2412_serial_probe,

	.remove		= __devexit_p(s3c24xx_serial_remove),

	.driver		= {

		.name	= "s3c2412-uart",

		.owner	= THIS_MODULE,

	},

};



static inline int s3c2412_serial_init(void)

{

	return s3c24xx_serial_init(&s3c2412_serial_driver, &s3c2412_uart_inf);

}



static inline void s3c2412_serial_exit(void)

{

	platform_driver_unregister(&s3c2412_serial_driver);

}



module_init(s3c2412_serial_init);

module_exit(s3c2412_serial_exit);



MODULE_DESCRIPTION("Samsung S3C2412,S3C2413 SoC Serial port driver");

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

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:s3c2412-uart");