forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm_serial: Convert to clk_prepare/unprepare

Browse source 
Add calls to clk_prepare and unprepare so that MSM can migrate to
the common clock framework.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
This commit is contained in:
Stephen Boyd 2013-06-17 10:43:08 -07:00 • committed by David Brown
commit f98cf83d0c
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/tty/serial/msm_serial.c
View file

@ -408,9 +408,9 @@ static void msm_init_clock(struct uart_port *port)
{ {
struct msm_port *msm_port = UART_TO_MSM(port); struct msm_port *msm_port = UART_TO_MSM(port);
clk_enable(msm_port->clk); clk_prepare_enable(msm_port->clk);
if (!IS_ERR(msm_port->pclk)) if (!IS_ERR(msm_port->pclk))
clk_enable(msm_port->pclk); clk_prepare_enable(msm_port->pclk);
msm_serial_set_mnd_regs(port); msm_serial_set_mnd_regs(port);
} }
@ -486,7 +486,7 @@ static void msm_shutdown(struct uart_port *port)
msm_port->imr = 0; msm_port->imr = 0;
msm_write(port, 0, UART_IMR); /* disable interrupts */ msm_write(port, 0, UART_IMR); /* disable interrupts */
clk_disable(msm_port->clk); clk_disable_unprepare(msm_port->clk);
free_irq(port->irq, port); free_irq(port->irq, port);
} }
@ -688,14 +688,14 @@ static void msm_power(struct uart_port *port, unsigned int state,
switch (state) { switch (state) {
case 0: case 0:
clk_enable(msm_port->clk); clk_prepare_enable(msm_port->clk);
if (!IS_ERR(msm_port->pclk)) if (!IS_ERR(msm_port->pclk))
clk_enable(msm_port->pclk); clk_prepare_enable(msm_port->pclk);
break; break;
case 3: case 3:
clk_disable(msm_port->clk); clk_disable_unprepare(msm_port->clk);
if (!IS_ERR(msm_port->pclk)) if (!IS_ERR(msm_port->pclk))
clk_disable(msm_port->pclk); clk_disable_unprepare(msm_port->pclk);
break; break;
default: default:
printk(KERN_ERR "msm_serial: Unknown PM state %d\n", state); printk(KERN_ERR "msm_serial: Unknown PM state %d\n", state);