From: Maxime Ripard <maxime@cerno.tech>
To: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Cc: linux-rpi-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Tim Gover <tim.gover@raspberrypi.com>,
Phil Elwell <phil@raspberrypi.com>,
Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
linux-clk@vger.kernel.org, Maxime Ripard <maxime@cerno.tech>
Subject: [PATCH v4 23/27] Revert "clk: bcm2835: remove pllb"
Date: Thu, 11 Jun 2020 09:32:12 +0200 [thread overview]
Message-ID: <2795d7ad33c9eba631fb356df7ff075ee5e8a0b8.1591860665.git-series.maxime@cerno.tech> (raw)
In-Reply-To: <cover.58c6e44891ff5bf61052b5804f7da9b5ba074840.1591860665.git-series.maxime@cerno.tech>
This reverts commit 2256d89333bd17b8b56b42734a7e1046d52f7fc3. Since we
will be expanding the firmware clock driver, we'll need to remove the
quirks to deal with the PLLB. However, we still want to expose the clock
tree properly, so having that clock in the MMIO driver will allow that.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/clk/bcm/clk-bcm2835.c | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 6bb7efa12037..32f5c13be9d1 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1684,10 +1684,32 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
- /*
- * PLLB is used for the ARM's clock. Controlled by firmware, see
- * clk-raspberrypi.c.
- */
+ /* PLLB is used for the ARM's clock. */
+ [BCM2835_PLLB] = REGISTER_PLL(
+ SOC_ALL,
+ .name = "pllb",
+ .cm_ctrl_reg = CM_PLLB,
+ .a2w_ctrl_reg = A2W_PLLB_CTRL,
+ .frac_reg = A2W_PLLB_FRAC,
+ .ana_reg_base = A2W_PLLB_ANA0,
+ .reference_enable_mask = A2W_XOSC_CTRL_PLLB_ENABLE,
+ .lock_mask = CM_LOCK_FLOCKB,
+
+ .ana = &bcm2835_ana_default,
+
+ .min_rate = 600000000u,
+ .max_rate = 3000000000u,
+ .max_fb_rate = BCM2835_MAX_FB_RATE),
+ [BCM2835_PLLB_ARM] = REGISTER_PLL_DIV(
+ SOC_ALL,
+ .name = "pllb_arm",
+ .source_pll = "pllb",
+ .cm_reg = CM_PLLB,
+ .a2w_reg = A2W_PLLB_ARM,
+ .load_mask = CM_PLLB_LOADARM,
+ .hold_mask = CM_PLLB_HOLDARM,
+ .fixed_divider = 1,
+ .flags = CLK_SET_RATE_PARENT),
/*
* PLLC is the core PLL, used to drive the core VPU clock.
--
git-series 0.9.1
next prev parent reply other threads:[~2020-06-11 7:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 7:31 [PATCH v4 00/27] clk: bcm: rpi: Add support for BCM2711 firmware clocks Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 01/27] dt-bindings: arm: bcm: Convert BCM2835 firmware binding to YAML Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 02/27] dt-bindings: clock: Add a binding for the RPi Firmware clocks Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 03/27] firmware: rpi: Only create clocks device if we don't have a node for it Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 04/27] clk: bcm: rpi: Allow the driver to be probed by DT Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 05/27] clk: bcm: rpi: Statically init clk_init_data Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 06/27] clk: bcm: rpi: Use clk_hw_register for pllb_arm Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 07/27] clk: bcm: rpi: Remove global pllb_arm clock pointer Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 08/27] clk: bcm: rpi: Make sure pllb_arm is removed Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 09/27] clk: bcm: rpi: Remove pllb_arm_lookup global pointer Maxime Ripard
2020-06-11 7:31 ` [PATCH v4 10/27] clk: bcm: rpi: Switch to clk_hw_register_clkdev Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 11/27] clk: bcm: rpi: Make sure the clkdev lookup is removed Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 12/27] clk: bcm: rpi: Use CCF boundaries instead of rolling our own Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 13/27] clk: bcm: rpi: Create a data structure for the clocks Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 14/27] clk: bcm: rpi: Add clock id to data Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 15/27] clk: bcm: rpi: Pass the clocks data to the firmware function Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 16/27] clk: bcm: rpi: Rename is_prepared function Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 17/27] clk: bcm: rpi: Split pllb clock hooks Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 18/27] clk: bcm: rpi: Make the PLLB registration function return a clk_hw Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 19/27] clk: bcm: rpi: Add DT provider for the clocks Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 20/27] clk: bcm: rpi: Add an enum for the firmware clocks Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 21/27] clk: bcm: rpi: Discover " Maxime Ripard
2020-06-11 11:14 ` Nicolas Saenz Julienne
2020-06-11 7:32 ` [PATCH v4 22/27] clk: bcm: rpi: Give firmware clocks a name Maxime Ripard
2020-06-11 7:32 ` Maxime Ripard [this message]
2020-06-11 11:15 ` [PATCH v4 23/27] Revert "clk: bcm2835: remove pllb" Nicolas Saenz Julienne
2020-06-11 7:32 ` [PATCH v4 24/27] ARM: dts: bcm2711: Add firmware clocks node Maxime Ripard
2020-06-11 7:32 ` [PATCH v4 25/27] clk: bcm2835: Allow custom CCF flags for the PLLs Maxime Ripard
2020-06-11 9:11 ` Nicolas Saenz Julienne
2020-06-11 7:32 ` [PATCH v4 26/27] clk: bcm2835: Don't cache the PLLB rate Maxime Ripard
2020-06-11 11:17 ` Nicolas Saenz Julienne
2020-06-11 7:32 ` [PATCH v4 27/27] clk: bcm: rpi: Remove the quirks for the CPU clock Maxime Ripard
2020-06-11 11:18 ` Nicolas Saenz Julienne
2020-06-11 11:21 ` [PATCH v4 00/27] clk: bcm: rpi: Add support for BCM2711 firmware clocks Nicolas Saenz Julienne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2795d7ad33c9eba631fb356df7ff075ee5e8a0b8.1591860665.git-series.maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=nsaenzjulienne@suse.de \
--cc=phil@raspberrypi.com \
--cc=sboyd@kernel.org \
--cc=tim.gover@raspberrypi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®