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, Philipp Zabel <p.zabel@pengutronix.de>,
Maxime Ripard <maxime@cerno.tech>
Subject: [PATCH v5 20/27] clk: bcm: rpi: Add an enum for the firmware clocks
Date: Mon, 15 Jun 2020 10:41:00 +0200 [thread overview]
Message-ID: <4738f77ee7de9b48a3bb1c558ead958d0cc064d9.1592210452.git-series.maxime@cerno.tech> (raw)
In-Reply-To: <cover.98f979c2af2337c57217016d21d7c68e1ac2ce8a.1592210452.git-series.maxime@cerno.tech>
While the firmware allows us to discover the available clocks, we need to
discriminate those clocks to only register the ones meaningful to Linux.
The firmware also doesn't provide a clock name, so having a list of the ID
will help us to give clocks a proper name later on.
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/clk/bcm/clk-raspberrypi.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
index 5f4e2d49432f..eebd16040f8a 100644
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -18,7 +18,23 @@
#include <soc/bcm2835/raspberrypi-firmware.h>
-#define RPI_FIRMWARE_ARM_CLK_ID 0x00000003
+enum rpi_firmware_clk_id {
+ RPI_FIRMWARE_EMMC_CLK_ID = 1,
+ RPI_FIRMWARE_UART_CLK_ID,
+ RPI_FIRMWARE_ARM_CLK_ID,
+ RPI_FIRMWARE_CORE_CLK_ID,
+ RPI_FIRMWARE_V3D_CLK_ID,
+ RPI_FIRMWARE_H264_CLK_ID,
+ RPI_FIRMWARE_ISP_CLK_ID,
+ RPI_FIRMWARE_SDRAM_CLK_ID,
+ RPI_FIRMWARE_PIXEL_CLK_ID,
+ RPI_FIRMWARE_PWM_CLK_ID,
+ RPI_FIRMWARE_HEVC_CLK_ID,
+ RPI_FIRMWARE_EMMC2_CLK_ID,
+ RPI_FIRMWARE_M2MC_CLK_ID,
+ RPI_FIRMWARE_PIXEL_BVB_CLK_ID,
+ RPI_FIRMWARE_NUM_CLK_ID,
+};
#define RPI_FIRMWARE_STATE_ENABLE_BIT BIT(0)
#define RPI_FIRMWARE_STATE_WAIT_BIT BIT(1)
@@ -31,8 +47,6 @@
#define A2W_PLL_FRAC_BITS 20
-#define NUM_FW_CLKS 16
-
struct raspberrypi_clk {
struct device *dev;
struct rpi_firmware *firmware;
@@ -320,7 +334,8 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
rpi->firmware = firmware;
platform_set_drvdata(pdev, rpi);
- clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, NUM_FW_CLKS),
+ clk_data = devm_kzalloc(dev, struct_size(clk_data, hws,
+ RPI_FIRMWARE_NUM_CLK_ID),
GFP_KERNEL);
if (!clk_data)
return -ENOMEM;
--
git-series 0.9.1
next prev parent reply other threads:[~2020-06-15 8:41 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 8:40 [PATCH v5 00/27] clk: bcm: rpi: Add support for BCM2711 firmware clocks Maxime Ripard
2020-06-15 8:40 ` [PATCH v5 01/27] dt-bindings: arm: bcm: Convert BCM2835 firmware binding to YAML Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 02/27] dt-bindings: clock: Add a binding for the RPi Firmware clocks Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 03/27] firmware: rpi: Only create clocks device if we don't have a node for it Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 04/27] clk: bcm: rpi: Allow the driver to be probed by DT Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 05/27] clk: bcm: rpi: Statically init clk_init_data Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 06/27] clk: bcm: rpi: Use clk_hw_register for pllb_arm Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 07/27] clk: bcm: rpi: Remove global pllb_arm clock pointer Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 08/27] clk: bcm: rpi: Make sure pllb_arm is removed Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 09/27] clk: bcm: rpi: Remove pllb_arm_lookup global pointer Maxime Ripard
2020-06-25 0:42 ` Stephen Boyd
2020-06-25 0:44 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 10/27] clk: bcm: rpi: Switch to clk_hw_register_clkdev Maxime Ripard
2020-06-25 0:44 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 11/27] clk: bcm: rpi: Make sure the clkdev lookup is removed Maxime Ripard
2020-06-25 0:44 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 12/27] clk: bcm: rpi: Use CCF boundaries instead of rolling our own Maxime Ripard
2020-06-25 0:44 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 13/27] clk: bcm: rpi: Create a data structure for the clocks Maxime Ripard
2020-06-25 0:44 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 14/27] clk: bcm: rpi: Add clock id to data Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 15/27] clk: bcm: rpi: Pass the clocks data to the firmware function Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 16/27] clk: bcm: rpi: Rename is_prepared function Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 17/27] clk: bcm: rpi: Split pllb clock hooks Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 18/27] clk: bcm: rpi: Make the PLLB registration function return a clk_hw Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:40 ` [PATCH v5 19/27] clk: bcm: rpi: Add DT provider for the clocks Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:41 ` Maxime Ripard [this message]
2020-06-25 0:45 ` [PATCH v5 20/27] clk: bcm: rpi: Add an enum for the firmware clocks Stephen Boyd
2020-06-15 8:41 ` [PATCH v5 21/27] clk: bcm: rpi: Discover " Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:41 ` [PATCH v5 22/27] clk: bcm: rpi: Give firmware clocks a name Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:41 ` [PATCH v5 23/27] Revert "clk: bcm2835: remove pllb" Maxime Ripard
2020-06-25 0:45 ` Stephen Boyd
2020-06-15 8:41 ` [PATCH v5 24/27] ARM: dts: bcm2711: Add firmware clocks node Maxime Ripard
2020-06-25 8:16 ` Nicolas Saenz Julienne
2020-06-15 8:41 ` [PATCH v5 25/27] clk: bcm2835: Allow custom CCF flags for the PLLs Maxime Ripard
2020-06-25 0:46 ` Stephen Boyd
2020-06-15 8:41 ` [PATCH v5 26/27] clk: bcm2835: Don't cache the PLLB rate Maxime Ripard
2020-06-25 0:46 ` Stephen Boyd
2020-06-15 8:41 ` [PATCH v5 27/27] clk: bcm: rpi: Remove the quirks for the CPU clock Maxime Ripard
2020-06-25 0:46 ` Stephen Boyd
2020-06-19 9:37 ` [PATCH v5 00/27] clk: bcm: rpi: Add support for BCM2711 firmware clocks Stephen Boyd
2020-06-19 9:44 ` Nicolas Saenz Julienne
2020-06-19 23:57 ` Stephen Boyd
2020-06-20 0:20 ` Stephen Boyd
2020-06-25 0:40 ` Stephen Boyd
2020-06-19 11:52 ` Maxime Ripard
2020-06-19 23:57 ` Stephen Boyd
2020-06-25 1:15 ` Stephen Boyd
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=4738f77ee7de9b48a3bb1c558ead958d0cc064d9.1592210452.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=p.zabel@pengutronix.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;
as well as URLs for NNTP newsgroup(s).