mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
8299d1f057
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
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;
|