You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
97 lines
3.1 KiB
Diff
97 lines
3.1 KiB
Diff
From 1231dbeb8bfeda68c53854cc68016acd74665079 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 7 Feb 2020 16:08:17 +0100
|
|
Subject: [PATCH] clk: bcm: rpi: Pass the clocks data to the firmware
|
|
function
|
|
|
|
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>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/clk/bcm/clk-raspberrypi.c | 29 ++++++++++++++---------------
|
|
1 file changed, 14 insertions(+), 15 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-raspberrypi.c
|
|
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
|
@@ -67,11 +67,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),
|
|
};
|
|
@@ -94,9 +95,8 @@ static int raspberrypi_fw_pll_is_on(stru
|
|
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;
|
|
|
|
@@ -113,9 +113,8 @@ static unsigned long raspberrypi_fw_pll_
|
|
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;
|
|
|
|
@@ -131,9 +130,9 @@ static int raspberrypi_fw_pll_set_rate(s
|
|
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);
|
|
@@ -198,18 +197,18 @@ static int raspberrypi_register_pllb(str
|
|
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);
|