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.
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From 19f7515528fbd1dc0d45e4b5ce6531c1406fc8d8 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 7 Feb 2020 17:03:46 +0100
|
|
Subject: [PATCH] clk: bcm: rpi: Add DT provider for the clocks
|
|
|
|
For the upcoming registration of the clocks provided by the firmware, make
|
|
sure it's exposed to the device tree providers.
|
|
|
|
Cc: Michael Turquette <mturquette@baylibre.com>
|
|
Cc: linux-clk@vger.kernel.org
|
|
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/clk/bcm/clk-raspberrypi.c | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
--- a/drivers/clk/bcm/clk-raspberrypi.c
|
|
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
|
@@ -31,6 +31,8 @@
|
|
|
|
#define A2W_PLL_FRAC_BITS 20
|
|
|
|
+#define NUM_FW_CLKS 16
|
|
+
|
|
struct raspberrypi_clk {
|
|
struct device *dev;
|
|
struct rpi_firmware *firmware;
|
|
@@ -285,11 +287,13 @@ static struct clk_hw *raspberrypi_regist
|
|
|
|
static int raspberrypi_clk_probe(struct platform_device *pdev)
|
|
{
|
|
+ struct clk_hw_onecell_data *clk_data;
|
|
struct device_node *firmware_node;
|
|
struct device *dev = &pdev->dev;
|
|
struct rpi_firmware *firmware;
|
|
struct raspberrypi_clk *rpi;
|
|
struct clk_hw *hw;
|
|
+ int ret;
|
|
|
|
firmware_node = of_parse_phandle(dev->of_node, "raspberrypi,firmware", 0);
|
|
if (!firmware_node) {
|
|
@@ -309,6 +313,11 @@ static int raspberrypi_clk_probe(struct
|
|
rpi->firmware = firmware;
|
|
platform_set_drvdata(pdev, rpi);
|
|
|
|
+ clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, NUM_FW_CLKS),
|
|
+ GFP_KERNEL);
|
|
+ if (!clk_data)
|
|
+ return -ENOMEM;
|
|
+
|
|
hw = raspberrypi_register_pllb(rpi);
|
|
if (IS_ERR(hw)) {
|
|
dev_err(dev, "Failed to initialize pllb, %ld\n", PTR_ERR(hw));
|
|
@@ -318,6 +327,13 @@ static int raspberrypi_clk_probe(struct
|
|
hw = raspberrypi_register_pllb_arm(rpi);
|
|
if (IS_ERR(hw))
|
|
return PTR_ERR(hw);
|
|
+ clk_data->hws[RPI_FIRMWARE_ARM_CLK_ID] = hw;
|
|
+ clk_data->num = RPI_FIRMWARE_ARM_CLK_ID + 1;
|
|
+
|
|
+ ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
|
|
+ clk_data);
|
|
+ if (ret)
|
|
+ return ret;
|
|
|
|
rpi->cpufreq = platform_device_register_data(dev, "raspberrypi-cpufreq",
|
|
-1, NULL, 0);
|