Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281951
b: refs/heads/master
c: a481377
h: refs/heads/master
i:
  281949: 26f77af
  281947: 487698c
  281943: 3e28265
  281935: 03295f5
  281919: e806922
v: v3
  • Loading branch information
Shawn Guo committed Dec 28, 2011
1 parent 6488194 commit 7424661
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e735489976c356a189f7332e6ff4b0dee2ede434
refs/heads/master: a481377013c1c07dac0421886db7a6b4c3081c49
8 changes: 4 additions & 4 deletions trunk/drivers/tty/serial/mxs-auart.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static int mxs_auart_startup(struct uart_port *u)
{
struct mxs_auart_port *s = to_auart_port(u);

clk_enable(s->clk);
clk_prepare_enable(s->clk);

writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR);

Expand Down Expand Up @@ -453,7 +453,7 @@ static void mxs_auart_shutdown(struct uart_port *u)
writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN | AUART_INTR_CTSMIEN,
u->membase + AUART_INTR_CLR);

clk_disable(s->clk);
clk_disable_unprepare(s->clk);
}

static unsigned int mxs_auart_tx_empty(struct uart_port *u)
Expand Down Expand Up @@ -634,7 +634,7 @@ auart_console_setup(struct console *co, char *options)
if (!s)
return -ENODEV;

clk_enable(s->clk);
clk_prepare_enable(s->clk);

if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow);
Expand All @@ -643,7 +643,7 @@ auart_console_setup(struct console *co, char *options)

ret = uart_set_options(&s->port, co, baud, parity, bits, flow);

clk_disable(s->clk);
clk_disable_unprepare(s->clk);

return ret;
}
Expand Down

0 comments on commit 7424661

Please sign in to comment.