Skip to content

Commit

Permalink
serial: pxa: fine-tune clk useage
Browse files Browse the repository at this point in the history
1) add clk_enable/disable in serial_pxa_console_write()
2) add clk_prepare() to follow common clock driver

Signed-off-by: Yi Zhang <yizhang@marvell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Yi Zhang authored and Greg Kroah-Hartman committed Jan 25, 2013
1 parent e8c5b56 commit 9429ccb
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/tty/serial/pxa.c
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
unsigned long flags;
int locked = 1;


clk_enable(up->clk);
local_irq_save(flags);
if (up->port.sysrq)
locked = 0;
Expand All @@ -699,6 +699,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
if (locked)
spin_unlock(&up->port.lock);
local_irq_restore(flags);
clk_disable(up->clk);

}

Expand Down Expand Up @@ -896,6 +897,12 @@ static int serial_pxa_probe(struct platform_device *dev)
goto err_free;
}

ret = clk_prepare(sport->clk);
if (ret) {
clk_put(sport->clk);
goto err_free;
}

sport->port.type = PORT_PXA;
sport->port.iotype = UPIO_MEM;
sport->port.mapbase = mmres->start;
Expand Down Expand Up @@ -927,6 +934,7 @@ static int serial_pxa_probe(struct platform_device *dev)
return 0;

err_clk:
clk_unprepare(sport->clk);
clk_put(sport->clk);
err_free:
kfree(sport);
Expand All @@ -940,6 +948,8 @@ static int serial_pxa_remove(struct platform_device *dev)
platform_set_drvdata(dev, NULL);

uart_remove_one_port(&serial_pxa_reg, &sport->port);

clk_unprepare(sport->clk);
clk_put(sport->clk);
kfree(sport);

Expand Down

0 comments on commit 9429ccb

Please sign in to comment.