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

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

[ARM] S3C: Update CONFIG_SERIAL_SAMSUNG_UARTS handling 



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: default avatarBen Dooks <ben-linux@fluff.org>
parent 03d5e77b

arch/arm/plat-s3c/init.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void __init s3c24xx_init_clocks(int xtal) 


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

 *

drivers/serial/samsung.c

+6 −3
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static struct uart_ops s3c24xx_serial_ops = { 
static struct uart_driver s3c24xx_uart_drv = {

	.owner		= THIS_MODULE,

	.dev_name	= "s3c2410_serial",

	.nr		= 3,

	.nr		= CONFIG_SERIAL_SAMSUNG_UARTS,

	.cons		= S3C24XX_SERIAL_CONSOLE,

	.driver_name	= S3C24XX_SERIAL_NAME,

	.major		= S3C24XX_SERIAL_MAJOR,
@@ -1012,8 +1012,11 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, 
	if (port->mapbase != 0)

		return 0;



	if (cfg->hwport > 3)

		return -EINVAL;

	if (cfg->hwport > CONFIG_SERIAL_SAMSUNG_UARTS) {

		printk(KERN_ERR "%s: port %d bigger than %d\n", __func__,

		       cfg->hwport, CONFIG_SERIAL_SAMSUNG_UARTS);

		return -ERANGE;

	}



	/* setup info for port */

	port->dev	= &platdev->dev;