mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
|
From 1f4814d8f97794fce825b1dfb98c7e3d2e6a58b1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
||
|
|
Date: Wed, 23 Jan 2019 16:11:50 +0000
|
||
|
|
Subject: [PATCH 0048/1085] clk-bcm2835: Don't wait for pllh lock
|
||
|
|
|
||
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||
|
|
---
|
||
|
|
drivers/clk/bcm/clk-bcm2835.c | 18 ++++++++++--------
|
||
|
|
1 file changed, 10 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||
|
|
@@ -647,15 +647,17 @@ static int bcm2835_pll_on(struct clk_hw
|
||
|
|
spin_unlock(&cprman->regs_lock);
|
||
|
|
|
||
|
|
/* Wait for the PLL to lock. */
|
||
|
|
- timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);
|
||
|
|
- while (!(cprman_read(cprman, CM_LOCK) & data->lock_mask)) {
|
||
|
|
- if (ktime_after(ktime_get(), timeout)) {
|
||
|
|
- dev_err(cprman->dev, "%s: couldn't lock PLL\n",
|
||
|
|
- clk_hw_get_name(hw));
|
||
|
|
- return -ETIMEDOUT;
|
||
|
|
- }
|
||
|
|
+ if (strcmp(data->name, "pllh")) {
|
||
|
|
+ timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);
|
||
|
|
+ while (!(cprman_read(cprman, CM_LOCK) & data->lock_mask)) {
|
||
|
|
+ if (ktime_after(ktime_get(), timeout)) {
|
||
|
|
+ dev_err(cprman->dev, "%s: couldn't lock PLL\n",
|
||
|
|
+ clk_hw_get_name(hw));
|
||
|
|
+ return -ETIMEDOUT;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
- cpu_relax();
|
||
|
|
+ cpu_relax();
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
cprman_write(cprman, data->a2w_ctrl_reg,
|