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 15/27] clk: bcm: rpi: Pass the clocks data to the firmware function
Date: Mon, 15 Jun 2020 10:40:55 +0200 [thread overview]
Message-ID: <d7a3b4df3ca23feb6e0d9c7ae2d232bfb913f926.1592210452.git-series.maxime@cerno.tech> (raw)
In-Reply-To: <cover.98f979c2af2337c57217016d21d7c68e1ac2ce8a.1592210452.git-series.maxime@cerno.tech>
The raspberry_clock_property only takes the clock ID as an argument, but
now that we have a clock data structure it makes more sense to just pass
that structure instead.
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/clk/bcm/clk-raspberrypi.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
index 97ac04604b0a..3fce49a65a79 100644
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -65,11 +65,12 @@ struct raspberrypi_firmware_prop {
__le32 disable_turbo;
} __packed;
-static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag,
- u32 clk, u32 *val)
+static int raspberrypi_clock_property(struct rpi_firmware *firmware,
+ const struct raspberrypi_clk_data *data,
+ u32 tag, u32 *val)
{
struct raspberrypi_firmware_prop msg = {
- .id = cpu_to_le32(clk),
+ .id = cpu_to_le32(data->id),
.val = cpu_to_le32(*val),
.disable_turbo = cpu_to_le32(1),
};
@@ -92,9 +93,8 @@ static int raspberrypi_fw_pll_is_on(struct clk_hw *hw)
u32 val = 0;
int ret;
- ret = raspberrypi_clock_property(rpi->firmware,
- RPI_FIRMWARE_GET_CLOCK_STATE,
- data->id, &val);
+ ret = raspberrypi_clock_property(rpi->firmware, data,
+ RPI_FIRMWARE_GET_CLOCK_STATE, &val);
if (ret)
return 0;
@@ -111,9 +111,8 @@ static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw,
u32 val = 0;
int ret;
- ret = raspberrypi_clock_property(rpi->firmware,
- RPI_FIRMWARE_GET_CLOCK_RATE,
- data->id, &val);
+ ret = raspberrypi_clock_property(rpi->firmware, data,
+ RPI_FIRMWARE_GET_CLOCK_RATE, &val);
if (ret)
return ret;
@@ -129,9 +128,9 @@ static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate,
u32 new_rate = rate / RPI_FIRMWARE_PLLB_ARM_DIV_RATE;
int ret;
- ret = raspberrypi_clock_property(rpi->firmware,
+ ret = raspberrypi_clock_property(rpi->firmware, data,
RPI_FIRMWARE_SET_CLOCK_RATE,
- data->id, &new_rate);
+ &new_rate);
if (ret)
dev_err_ratelimited(rpi->dev, "Failed to change %s frequency: %d",
clk_hw_get_name(hw), ret);
@@ -194,18 +193,18 @@ static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi)
init.flags = CLK_GET_RATE_NOCACHE | CLK_IGNORE_UNUSED;
/* Get min & max rates set by the firmware */
- ret = raspberrypi_clock_property(rpi->firmware,
+ ret = raspberrypi_clock_property(rpi->firmware, data,
RPI_FIRMWARE_GET_MIN_CLOCK_RATE,
- data->id, &min_rate);
+ &min_rate);
if (ret) {
dev_err(rpi->dev, "Failed to get %s min freq: %d\n",
init.name, ret);
return ret;
}
- ret = raspberrypi_clock_property(rpi->firmware,
+ ret = raspberrypi_clock_property(rpi->firmware, data,
RPI_FIRMWARE_GET_MAX_CLOCK_RATE,
- data->id, &max_rate);
+ &max_rate);
if (ret) {
dev_err(rpi->dev, "Failed to get %s max freq: %d\n",
init.name, ret);
--
git-series 0.9.1
next prev parent reply other threads:[~2020-06-15 8:42 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 ` Maxime Ripard [this message]
2020-06-25 0:45 ` [PATCH v5 15/27] clk: bcm: rpi: Pass the clocks data to the firmware function 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 ` [PATCH v5 20/27] clk: bcm: rpi: Add an enum for the firmware clocks Maxime Ripard
2020-06-25 0:45 ` 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=d7a3b4df3ca23feb6e0d9c7ae2d232bfb913f926.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).