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

Commit 470f2297 authored by Boojin Kim's avatar Boojin Kim Committed by Greg Kroah-Hartman
Browse files

ARM: SAMSUNG: serial: Fix on handling of one clock source for UART 



This patch fixes the way of comparison for handling of two or more
clock sources for UART.

For example, if just only one clock source is defined even though
there are two clock sources for UART, the serial driver does not
set proper clock up. Of course, it is problem.

So this patch changes the condition of comparison to avoid useless
setup clock and adds a flag 'NO_NEED_CHECK_CLKSRC' which means
selection of source clock is not required.

In addition, since the Exynos4210 has only one clock source for UART
this patch adds the flag into its common_init_uarts().

Signed-off-by: default avatarBoojin Kim <boojin.kim@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent af99d6f0

arch/arm/mach-exynos4/init.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ void __init exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no) 
			tcfg->clocks = exynos4_serial_clocks;

			tcfg->clocks_size = ARRAY_SIZE(exynos4_serial_clocks);

		}

		tcfg->flags |= NO_NEED_CHECK_CLKSRC;

	}



	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);

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

+2 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ 
#define S5PV210_UFSTAT_RXMASK	(255<<0)

#define S5PV210_UFSTAT_RXSHIFT	(0)



#define NO_NEED_CHECK_CLKSRC	1



#ifndef __ASSEMBLY__



/* struct s3c24xx_uart_clksrc

drivers/tty/serial/s5pv210.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int s5pv210_serial_setsource(struct uart_port *port, 
	struct s3c2410_uartcfg *cfg = port->dev->platform_data;

	unsigned long ucon = rd_regl(port, S3C2410_UCON);



	if ((cfg->clocks_size) == 1)

	if (cfg->flags & NO_NEED_CHECK_CLKSRC)

		return 0;



	if (strcmp(clk->name, "pclk") == 0)
@@ -55,7 +55,7 @@ static int s5pv210_serial_getsource(struct uart_port *port, 


	clk->divisor = 1;



	if ((cfg->clocks_size) == 1)

	if (cfg->flags & NO_NEED_CHECK_CLKSRC)

		return 0;



	switch (ucon & S5PV210_UCON_CLKMASK) {