Skip to content

Commit

Permalink
serial: sh-sci: Fix module clock refcounting.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dmitry pervushin authored and Paul Mundt committed May 7, 2007
1 parent 1929cb3 commit 1534a3b
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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,
Expand All @@ -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
Expand Down

0 comments on commit 1534a3b

Please sign in to comment.