diff options
| -rw-r--r-- | arch/arm/mach-exynos4/init.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/regs-serial.h | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/s5pv210.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos4/init.c b/arch/arm/mach-exynos4/init.c index cf91f50e43ab..a8a83e3881a4 100644 --- a/arch/arm/mach-exynos4/init.c +++ b/arch/arm/mach-exynos4/init.c | |||
| @@ -35,6 +35,7 @@ void __init exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no) | |||
| 35 | tcfg->clocks = exynos4_serial_clocks; | 35 | tcfg->clocks = exynos4_serial_clocks; |
| 36 | tcfg->clocks_size = ARRAY_SIZE(exynos4_serial_clocks); | 36 | tcfg->clocks_size = ARRAY_SIZE(exynos4_serial_clocks); |
| 37 | } | 37 | } |
| 38 | tcfg->flags |= NO_NEED_CHECK_CLKSRC; | ||
| 38 | } | 39 | } |
| 39 | 40 | ||
| 40 | s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no); | 41 | s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no); |
diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h index c151c5f94a87..116edfe120b9 100644 --- a/arch/arm/plat-samsung/include/plat/regs-serial.h +++ b/arch/arm/plat-samsung/include/plat/regs-serial.h | |||
| @@ -224,6 +224,8 @@ | |||
| 224 | #define S5PV210_UFSTAT_RXMASK (255<<0) | 224 | #define S5PV210_UFSTAT_RXMASK (255<<0) |
| 225 | #define S5PV210_UFSTAT_RXSHIFT (0) | 225 | #define S5PV210_UFSTAT_RXSHIFT (0) |
| 226 | 226 | ||
| 227 | #define NO_NEED_CHECK_CLKSRC 1 | ||
| 228 | |||
| 227 | #ifndef __ASSEMBLY__ | 229 | #ifndef __ASSEMBLY__ |
| 228 | 230 | ||
| 229 | /* struct s3c24xx_uart_clksrc | 231 | /* struct s3c24xx_uart_clksrc |
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c index fb2619f93d84..dd194dc80ee9 100644 --- a/drivers/tty/serial/s5pv210.c +++ b/drivers/tty/serial/s5pv210.c | |||
| @@ -30,7 +30,7 @@ static int s5pv210_serial_setsource(struct uart_port *port, | |||
| 30 | struct s3c2410_uartcfg *cfg = port->dev->platform_data; | 30 | struct s3c2410_uartcfg *cfg = port->dev->platform_data; |
| 31 | unsigned long ucon = rd_regl(port, S3C2410_UCON); | 31 | unsigned long ucon = rd_regl(port, S3C2410_UCON); |
| 32 | 32 | ||
| 33 | if ((cfg->clocks_size) == 1) | 33 | if (cfg->flags & NO_NEED_CHECK_CLKSRC) |
| 34 | return 0; | 34 | return 0; |
| 35 | 35 | ||
| 36 | if (strcmp(clk->name, "pclk") == 0) | 36 | if (strcmp(clk->name, "pclk") == 0) |
| @@ -55,7 +55,7 @@ static int s5pv210_serial_getsource(struct uart_port *port, | |||
| 55 | 55 | ||
| 56 | clk->divisor = 1; | 56 | clk->divisor = 1; |
| 57 | 57 | ||
| 58 | if ((cfg->clocks_size) == 1) | 58 | if (cfg->flags & NO_NEED_CHECK_CLKSRC) |
| 59 | return 0; | 59 | return 0; |
| 60 | 60 | ||
| 61 | switch (ucon & S5PV210_UCON_CLKMASK) { | 61 | switch (ucon & S5PV210_UCON_CLKMASK) { |
