Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f98cf83d0c7c6bf803a75eb1e7c99b6457f12f98

Authored by Stephen Boyd
Committed by David Brown
1 parent f722406faa
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

msm_serial: Convert to clk_prepare/unprepare 

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>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

drivers/tty/serial/msm_serial.c
Diff comments   View file @ f98cf83
... ... @@ -408,9 +408,9 @@
408 408 {
409 409 struct msm_port *msm_port = UART_TO_MSM(port);
410 410  
411   - clk_enable(msm_port->clk);
  411 + clk_prepare_enable(msm_port->clk);
412 412 if (!IS_ERR(msm_port->pclk))
413   - clk_enable(msm_port->pclk);
  413 + clk_prepare_enable(msm_port->pclk);
414 414 msm_serial_set_mnd_regs(port);
415 415 }
416 416  
... ... @@ -486,7 +486,7 @@
486 486 msm_port->imr = 0;
487 487 msm_write(port, 0, UART_IMR); /* disable interrupts */
488 488  
489   - clk_disable(msm_port->clk);
  489 + clk_disable_unprepare(msm_port->clk);
490 490  
491 491 free_irq(port->irq, port);
492 492 }
493 493  
494 494  
495 495  
... ... @@ -688,14 +688,14 @@
688 688  
689 689 switch (state) {
690 690 case 0:
691   - clk_enable(msm_port->clk);
  691 + clk_prepare_enable(msm_port->clk);
692 692 if (!IS_ERR(msm_port->pclk))
693   - clk_enable(msm_port->pclk);
  693 + clk_prepare_enable(msm_port->pclk);
694 694 break;
695 695 case 3:
696   - clk_disable(msm_port->clk);
  696 + clk_disable_unprepare(msm_port->clk);
697 697 if (!IS_ERR(msm_port->pclk))
698   - clk_disable(msm_port->pclk);
  698 + clk_disable_unprepare(msm_port->pclk);
699 699 break;
700 700 default:
701 701 printk(KERN_ERR "msm_serial: Unknown PM state %d\n", state);