linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-serial@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
	Kukjin Kim <kgene.kim@samsung.com>, stable <stable@kernel.org>,
	Boojin Kim <boojin.kim@samsung.com>
Subject: [PATCH 03/12] ARM: SAMSUNG: serial: Fix on handling of one clock source for UART
Date: Tue, 28 Jun 2011 09:03:40 -0700	[thread overview]
Message-ID: <1309277029-1532-3-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <1309277029-1532-1-git-send-email-gregkh@suse.de>

From: Boojin Kim <boojin.kim@samsung.com>

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: Boojin Kim <boojin.kim@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 arch/arm/mach-exynos4/init.c                     |    1 +
 arch/arm/plat-samsung/include/plat/regs-serial.h |    2 ++
 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 cf91f50..a8a83e3 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)
 			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);
diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h
index c151c5f..116edfe 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 @@
 #define S5PV210_UFSTAT_RXMASK	(255<<0)
 #define S5PV210_UFSTAT_RXSHIFT	(0)
 
+#define NO_NEED_CHECK_CLKSRC	1
+
 #ifndef __ASSEMBLY__
 
 /* struct s3c24xx_uart_clksrc
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c
index fb2619f..dd194dc 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,
 	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) {
-- 
1.7.5.4

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

  parent reply	other threads:[~2011-06-28 16:03 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-28 15:38 [GIT PATCH] TTY/serial driver fixes for 3.0 Greg KH
2011-06-28 16:03 ` [PATCH 01/12] 8250_pci: add -ENODEV code for Intel EG20T PCH Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 02/12] serial: ioremap warning fix for jsm driver Greg Kroah-Hartman
2011-06-28 16:03   ` Greg Kroah-Hartman [this message]
2011-06-28 16:03   ` [PATCH 04/12] 8250_pci: Fix missing const from merges Greg Kroah-Hartman
2011-06-29  1:36     ` Guenter Roeck
2011-06-29  4:20       ` Greg KH
2011-06-29 14:41         ` Guenter Roeck
2011-06-28 16:03   ` [PATCH 05/12] 8250: Fix capabilities when changing the port type Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 06/12] TTY: ldisc, do not close until there are readers Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 07/12] TTY: ntty, add one more sanity check Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 08/12] tty: n_gsm: Fixed logic to decode break signal from modem status Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 09/12] tty: n_gsm: improper skb_pull() use was leaking framed data Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 10/12] amba pl011: workaround for uart registers lockup Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 11/12] amba pl011: platform data for reg lockup and glitch v2 Greg Kroah-Hartman
2011-06-28 16:03   ` [PATCH 12/12] serial: bcm63xx_uart: fix irq storm after rx fifo overrun Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1309277029-1532-3-git-send-email-gregkh@suse.de \
    --to=gregkh@suse.de \
    --cc=boojin.kim@samsung.com \
    --cc=kgene.kim@samsung.com \
    --cc=linux-serial@vger.kernel.org \
    --cc=stable@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).