aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial/sh-sci.c
diff options
context:
space:
mode:
authordmitry pervushin <dimka@nomadgs.com>2007-04-24 13:41:12 +0900
committerPaul Mundt <lethal@hera.kernel.org>2007-05-07 02:11:56 +0000
commit1534a3b3dc1cbab006f0add253be1b095d738b82 (patch)
tree198327387726950113863d60ecc19aaf63680218 /drivers/serial/sh-sci.c
parent1929cb340b74904c130fdf3de3fe5bbedb68a5aa (diff)
serial: sh-sci: Fix module clock refcounting.
This adds the enable/disable hooks for the port clock to sh-sci. Signed-off-by: dmitry pervushin <dimka@nomadgs.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial/sh-sci.c')
-rw-r--r--drivers/serial/sh-sci.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 0a34fa9e073..e5cf57f482c 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -77,6 +77,9 @@ struct sci_port {
/* Break timer */
struct timer_list break_timer;
int break_flag;
+
+ /* Port clock */
+ struct clk *clk;
};
#ifdef CONFIG_SH_KGDB
@@ -955,6 +958,8 @@ static int sci_startup(struct uart_port *port)
if (s->enable)
s->enable(port);
+ s->clk = clk_get(NULL, "module_clk");
+
sci_request_irq(s);
sci_start_tx(port);
sci_start_rx(port, 1);
@@ -972,6 +977,9 @@ static void sci_shutdown(struct uart_port *port)
if (s->disable)
s->disable(port);
+
+ clk_put(s->clk);
+ s->clk = NULL;
}
static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
@@ -990,9 +998,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
default:
{
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
- struct clk *clk = clk_get(NULL, "module_clk");
- t = SCBRR_VALUE(baud, clk_get_rate(clk));
- clk_put(clk);
+ t = SCBRR_VALUE(baud, clk_get_rate(s->clk));
#else
t = SCBRR_VALUE(baud);
#endif