sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

MACH SAMSUNG/S3C: Unify the UART driver for the S3C family of CPUs 

The UART is one of the units which differs only slightly inside the S3C family.
Prepare this driver to share it with more recent CPUs.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Juergen Beisert 2012-01-02 12:44:00 +01:00 committed by Sascha Hauer
parent 88200bfb33
commit b8560b2b2f
7 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boards/a9m2410/a9m2410.c
View File

@ -167,7 +167,7 @@ void __bare_init nand_boot(void)
static int a9m2410_console_init(void)
{
add_generic_device("s3c24x0_serial", -1, NULL, UART1_BASE, UART1_SIZE,
add_generic_device("s3c_serial", -1, NULL, S3C_UART1_BASE, S3C_UART1_SIZE,
IORESOURCE_MEM, NULL);
return 0;
}

2
arch/arm/boards/a9m2440/a9m2440.c
View File

@ -168,7 +168,7 @@ void __bare_init nand_boot(void)
static int a9m2440_console_init(void)
{
add_generic_device("s3c24x0_serial", -1, NULL, UART1_BASE, UART1_SIZE,
add_generic_device("s3c_serial", -1, NULL, S3C_UART1_BASE, S3C_UART1_SIZE,
IORESOURCE_MEM, NULL);
return 0;
}

2
arch/arm/boards/mini2440/mini2440.c
View File

@ -342,7 +342,7 @@ static int mini2440_console_init(void)
s3c_gpio_mode(GPH2_TXD0);
s3c_gpio_mode(GPH3_RXD0);
add_generic_device("s3c24x0_serial", -1, NULL, UART1_BASE, UART1_SIZE,
add_generic_device("s3c_serial", -1, NULL, S3C_UART1_BASE, S3C_UART1_SIZE,
IORESOURCE_MEM, NULL);
return 0;
}

15
arch/arm/mach-samsung/include/mach/s3c-iomap.h
View File

@ -28,7 +28,7 @@
#define S3C_CLOCK_POWER_BASE 0x4C000000
#define S3C2410_LCD_BASE 0x4D000000
#define S3C24X0_NAND_BASE 0x4E000000
#define S3C24X0_UART_BASE 0x50000000
#define S3C_UART_BASE 0x50000000
#define S3C_TIMER_BASE 0x51000000
#define S3C2410_USB_DEVICE_BASE 0x52000140
#define S3C_WATCHDOG_BASE 0x53000000
@ -52,13 +52,12 @@
#endif
#define NFC_RAM_SIZE 4096
/* internal UARTs (driver based) */
#define UART1_BASE (S3C24X0_UART_BASE)
#define UART1_SIZE 0x4000
#define UART2_BASE (S3C24X0_UART_BASE + 0x4000)
#define UART2_SIZE 0x4000
#define UART3_BASE (S3C24X0_UART_BASE + 0x8000)
#define UART3_SIZE 0x4000
#define S3C_UART1_BASE (S3C_UART_BASE)
#define S3C_UART1_SIZE 0x4000
#define S3C_UART2_BASE (S3C_UART_BASE + 0x4000)
#define S3C_UART2_SIZE 0x4000
#define S3C_UART3_BASE (S3C_UART_BASE + 0x8000)
#define S3C_UART3_SIZE 0x4000
/* CS configuration (direct access) */
#define BWSCON (S3C24X0_MEMCTL_BASE)

10
drivers/serial/Kconfig
View File

@ -78,16 +78,16 @@ config DRIVER_SERIAL_PL010
help
Enable this to get support for AMBA PL010 based serial devices
config DRIVER_SERIAL_S3C24X0
bool "Samsung S3C24X0 serial driver"
config DRIVER_SERIAL_S3C
bool "Samsung S3C serial driver"
depends on ARCH_S3C24xx
default y
help
Say Y here if you want to use the CONS on a S3C24X0 CPU
Say Y here if you want to use the CONS on a Samsung S3C CPU
config DRIVER_SERIAL_S3C24X0_AUTOSYNC
config DRIVER_SERIAL_S3C_AUTOSYNC
bool "Enable auto flow"
depends on DRIVER_SERIAL_S3C24X0
depends on DRIVER_SERIAL_S3C
help
Say Y here if you want to use the auto flow feature of this
UART. RTS and CTS will be handled by the hardware when enabled.

2
drivers/serial/Makefile
View File

@ -15,7 +15,7 @@ obj-$(CONFIG_DRIVER_SERIAL_MPC5XXX) += serial_mpc5xxx.o
obj-$(CONFIG_DRIVER_SERIAL_BLACKFIN) += serial_blackfin.o
obj-$(CONFIG_DRIVER_SERIAL_NS16550) += serial_ns16550.o
obj-$(CONFIG_DRIVER_SERIAL_PL010) += serial_pl010.o
obj-$(CONFIG_DRIVER_SERIAL_S3C24X0) += serial_s3c24x0.o
obj-$(CONFIG_DRIVER_SERIAL_S3C) += serial_s3c.o
obj-$(CONFIG_DRIVER_SERIAL_ALTERA) += serial_altera.o
obj-$(CONFIG_DRIVER_SERIAL_ALTERA_JTAG) += serial_altera_jtag.o
obj-$(CONFIG_DRIVER_SERIAL_PXA) += serial_pxa.o

68
drivers/serial/serial_s3c24x0.c → drivers/serial/serial_s3c.c
View File

@ -1,5 +1,5 @@
/*
* (c) 2009 Juergen Beisert <j.beisert@saschahauer.de>
* (c) 2009...2011 Juergen Beisert <j.beisert@pengutronix.de>
*
* Based on code from:
* (c) 2004 Sascha Hauer <sascha@saschahauer.de>
@ -41,20 +41,36 @@
#define URXH 0x24 /* receive */
#define UBRDIV 0x28 /* baudrate generator */
static int s3c24x0_serial_setbaudrate(struct console_device *cdev, int baudrate)
static unsigned s3c_get_arch_uart_input_clock(void __iomem *base)
{
unsigned reg = readw(base + UCON);
switch (reg & 0xc00) {
case 0x000:
case 0x800:
return s3c_get_pclk();
case 0x400:
break; /* TODO UEXTCLK */
case 0xc00:
break; /* TODO FCLK/n */
}
return 0; /* not nice, but we can't emit an error message! */
}
static int s3c_serial_setbaudrate(struct console_device *cdev, int baudrate)
{
struct device_d *dev = cdev->dev;
void __iomem *base = dev->priv;
unsigned val;
/* value is calculated so : PCLK / (16 * baudrate) -1 */
val = s3c_get_pclk() / (16 * baudrate) - 1;
val = s3c_get_arch_uart_input_clock(base) / (16 * baudrate) - 1;
writew(val, base + UBRDIV);
return 0;
}
static int s3c24x0_serial_init_port(struct console_device *cdev)
static int s3c_serial_init_port(struct console_device *cdev)
{
struct device_d *dev = cdev->dev;
void __iomem *base = dev->priv;
@ -71,7 +87,7 @@ static int s3c24x0_serial_init_port(struct console_device *cdev)
*/
writew(0x0245, base + UCON);
#ifdef CONFIG_DRIVER_SERIAL_S3C24X0_AUTOSYNC
#ifdef CONFIG_DRIVER_SERIAL_S3C_AUTOSYNC
writeb(0x10, base + UMCON); /* enable auto flow control */
#else
writeb(0x01, base + UMCON); /* RTS up */
@ -80,7 +96,7 @@ static int s3c24x0_serial_init_port(struct console_device *cdev)
return 0;
}
static void s3c24x0_serial_putc(struct console_device *cdev, char c)
static void s3c_serial_putc(struct console_device *cdev, char c)
{
struct device_d *dev = cdev->dev;
void __iomem *base = dev->priv;
@ -92,7 +108,7 @@ static void s3c24x0_serial_putc(struct console_device *cdev, char c)
writeb(c, base + UTXH);
}
static int s3c24x0_serial_tstc(struct console_device *cdev)
static int s3c_serial_tstc(struct console_device *cdev)
{
struct device_d *dev = cdev->dev;
void __iomem *base = dev->priv;
@ -104,7 +120,7 @@ static int s3c24x0_serial_tstc(struct console_device *cdev)
return 0;
}
static int s3c24x0_serial_getc(struct console_device *cdev)
static int s3c_serial_getc(struct console_device *cdev)
{
struct device_d *dev = cdev->dev;
void __iomem *base = dev->priv;
@ -116,7 +132,7 @@ static int s3c24x0_serial_getc(struct console_device *cdev)
return readb(base + URXH);
}
static void s3c24x0_serial_flush(struct console_device *cdev)
static void s3c_serial_flush(struct console_device *cdev)
{
struct device_d *dev = cdev->dev;
void __iomem *base = dev->priv;
@ -125,7 +141,7 @@ static void s3c24x0_serial_flush(struct console_device *cdev)
;
}
static int s3c24x0_serial_probe(struct device_d *dev)
static int s3c_serial_probe(struct device_d *dev)
{
struct console_device *cdev;
@ -134,13 +150,13 @@ static int s3c24x0_serial_probe(struct device_d *dev)
dev->priv = dev_request_mem_region(dev, 0);
cdev->dev = dev;
cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR;
cdev->tstc = s3c24x0_serial_tstc;
cdev->putc = s3c24x0_serial_putc;
cdev->getc = s3c24x0_serial_getc;
cdev->flush = s3c24x0_serial_flush;
cdev->setbrg = s3c24x0_serial_setbaudrate;
cdev->tstc = s3c_serial_tstc;
cdev->putc = s3c_serial_putc;
cdev->getc = s3c_serial_getc;
cdev->flush = s3c_serial_flush;
cdev->setbrg = s3c_serial_setbaudrate;
s3c24x0_serial_init_port(cdev);
s3c_serial_init_port(cdev);
/* Enable UART */
console_register(cdev);
@ -148,25 +164,25 @@ static int s3c24x0_serial_probe(struct device_d *dev)
return 0;
}
static void s3c24x0_serial_remove(struct device_d *dev)
static void s3c_serial_remove(struct device_d *dev)
{
struct console_device *cdev = dev->type_data;
s3c24x0_serial_flush(cdev);
s3c_serial_flush(cdev);
free(cdev);
dev->type_data = NULL;
}
static struct driver_d s3c24x0_serial_driver = {
.name = "s3c24x0_serial",
.probe = s3c24x0_serial_probe,
.remove = s3c24x0_serial_remove,
static struct driver_d s3c_serial_driver = {
.name = "s3c_serial",
.probe = s3c_serial_probe,
.remove = s3c_serial_remove,
};
static int s3c24x0_serial_init(void)
static int s3c_serial_init(void)
{
register_driver(&s3c24x0_serial_driver);
register_driver(&s3c_serial_driver);
return 0;
}
console_initcall(s3c24x0_serial_init);
console_initcall(s3c_serial_init);