Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fdfcab17a26ab2179c9d233f8a1b63e93cff9a4a

Authored by Shinya Kuribayashi
Committed by Daniel Lezcano
1 parent 4a7d3e8a99
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

clocksource: em_sti: convert to clk_prepare/unprepare 

Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can
migrate to the common clock framework.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

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

drivers/clocksource/em_sti.c
Diff comments   View file @ fdfcab1
... ... @@ -78,7 +78,7 @@
78 78 int ret;
79 79  
80 80 /* enable clock */
81   - ret = clk_enable(p->clk);
  81 + ret = clk_prepare_enable(p->clk);
82 82 if (ret) {
83 83 dev_err(&p->pdev->dev, "cannot enable clock\n");
84 84 return ret;
... ... @@ -107,7 +107,7 @@
107 107 em_sti_write(p, STI_INTENCLR, 3);
108 108  
109 109 /* stop clock */
110   - clk_disable(p->clk);
  110 + clk_disable_unprepare(p->clk);
111 111 }
112 112  
113 113 static cycle_t em_sti_count(struct em_sti_priv *p)