1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From 20d6f2f3e034889bcadb960e6ee4d6822d9dbcd7 Mon Sep 17 00:00:00 2001
From: Dom Cobley <popcornmix@gmail.com>
Date: Tue, 13 Apr 2021 16:48:35 +0100
Subject: [PATCH] bcm2835-unicam: Switch to new clock api
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
---
drivers/media/platform/bcm2835/bcm2835-unicam.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
@@ -426,6 +426,8 @@ struct unicam_device {
struct clk *clock;
/* vpu clock handle */
struct clk *vpu_clock;
+ /* vpu clock request */
+ struct clk_request *vpu_req;
/* clock status for error handling */
bool clocks_enabled;
/* V4l2 device */
@@ -1691,8 +1693,8 @@ static int unicam_start_streaming(struct
unicam_dbg(1, dev, "Running with %u data lanes\n",
dev->active_data_lanes);
- ret = clk_set_min_rate(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
- if (ret) {
+ dev->vpu_req = clk_request_start(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
+ if (!dev->vpu_req) {
unicam_err(dev, "failed to set up VPU clock\n");
goto err_pm_put;
}
@@ -1748,8 +1750,7 @@ err_disable_unicam:
unicam_disable(dev);
clk_disable_unprepare(dev->clock);
err_vpu_clock:
- if (clk_set_min_rate(dev->vpu_clock, 0))
- unicam_err(dev, "failed to reset the VPU clock\n");
+ clk_request_done(dev->vpu_req);
clk_disable_unprepare(dev->vpu_clock);
err_pm_put:
unicam_runtime_put(dev);
@@ -1779,9 +1780,7 @@ static void unicam_stop_streaming(struct
unicam_disable(dev);
if (dev->clocks_enabled) {
- if (clk_set_min_rate(dev->vpu_clock, 0))
- unicam_err(dev, "failed to reset the min VPU clock\n");
-
+ clk_request_done(dev->vpu_req);
clk_disable_unprepare(dev->vpu_clock);
clk_disable_unprepare(dev->clock);
dev->clocks_enabled = false;
|
