From 742466116803cc7ef1471644c3c60b59c4302d92 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Tue, 20 Dec 2011 14:10:29 +0800 Subject: [PATCH] --- yaml --- r: 281951 b: refs/heads/master c: a481377013c1c07dac0421886db7a6b4c3081c49 h: refs/heads/master i: 281949: 26f77af61e61f0f369b663fef6ad9ce069306060 281947: 487698c766f332c4fc889289056ad005307e28cc 281943: 3e28265304f8293a53d8c37abe286a7d34df54ec 281935: 03295f5c3aee5e79d7bb4c9ec9cfbf617a0a78bd 281919: e806922fc527112e859c09aa066e1139556bc633 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/mxs-auart.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bee513b91cf0..2f72c4f1c911 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e735489976c356a189f7332e6ff4b0dee2ede434 +refs/heads/master: a481377013c1c07dac0421886db7a6b4c3081c49 diff --git a/trunk/drivers/tty/serial/mxs-auart.c b/trunk/drivers/tty/serial/mxs-auart.c index 7e02c9c344fe..c33500a5e032 100644 --- a/trunk/drivers/tty/serial/mxs-auart.c +++ b/trunk/drivers/tty/serial/mxs-auart.c @@ -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); @@ -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) @@ -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); @@ -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; }