mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 11:36:49 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 3924edc9bd3c55d48c383c1046d75e163ce3cddb Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 23 Jan 2019 16:11:50 +0000
|
|
Subject: [PATCH] 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
|
|
@@ -627,15 +627,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,
|