lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] S3C: Update CONFIG_SERIAL_SAMSUNG_UARTS handling

Browse Source 
Fix the usage of CONFIG_SERIAL_SAMSUNG_UARTS in several places
in the kernel where it had been missed. This finishes fixing a
long standing issue where S3C2443 and S3C64XX could not use the
4th UART

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Ben Dooks
2008-11-03 19:51:42 +00:00
parent 03d5e77bb6
commit bdd4915a9f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/plat-s3c/init.c
View File

@@ -91,7 +91,7 @@ void __init s3c24xx_init_clocks(int xtal)
static int nr_uarts __initdata = 0; static int nr_uarts __initdata = 0;
static struct s3c2410_uartcfg uart_cfgs[3]; static struct s3c2410_uartcfg uart_cfgs[CONFIG_SERIAL_SAMSUNG_UARTS];
/* s3c24xx_init_uartdevs /* s3c24xx_init_uartdevs
* *

9
drivers/serial/samsung.c
View File

@@ -824,7 +824,7 @@ static struct uart_ops s3c24xx_serial_ops = {
static struct uart_driver s3c24xx_uart_drv = { static struct uart_driver s3c24xx_uart_drv = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dev_name = "s3c2410_serial", .dev_name = "s3c2410_serial",
.nr = 3, .nr = CONFIG_SERIAL_SAMSUNG_UARTS,
.cons = S3C24XX_SERIAL_CONSOLE, .cons = S3C24XX_SERIAL_CONSOLE,
.driver_name = S3C24XX_SERIAL_NAME, .driver_name = S3C24XX_SERIAL_NAME,
.major = S3C24XX_SERIAL_MAJOR, .major = S3C24XX_SERIAL_MAJOR,
@@ -1012,8 +1012,11 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
if (port->mapbase != 0) if (port->mapbase != 0)
return 0; return 0;
if (cfg->hwport > 3) if (cfg->hwport > CONFIG_SERIAL_SAMSUNG_UARTS) {
return -EINVAL; printk(KERN_ERR "%s: port %d bigger than %d\n", __func__,
cfg->hwport, CONFIG_SERIAL_SAMSUNG_UARTS);
return -ERANGE;
}
/* setup info for port */ /* setup info for port */
port->dev = &platdev->dev; port->dev = &platdev->dev;