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.
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 2d1c30a79cb9d390d2425852ff8c9527c31b3ab8 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 12 Feb 2020 14:21:45 +0100
|
|
Subject: [PATCH] clk: bcm: rpi: Switch to clk_hw_register_clkdev
|
|
|
|
Since we don't care about retrieving the clk_lookup structure pointer
|
|
returned by clkdev_hw_create, we can just use the clk_hw_register_clkdev
|
|
function.
|
|
|
|
Cc: Michael Turquette <mturquette@baylibre.com>
|
|
Cc: linux-clk@vger.kernel.org
|
|
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/clk/bcm/clk-raspberrypi.c | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-raspberrypi.c
|
|
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
|
@@ -237,7 +237,6 @@ static struct clk_fixed_factor raspberry
|
|
|
|
static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
|
|
{
|
|
- struct clk_lookup *pllb_arm_lookup;
|
|
int ret;
|
|
|
|
ret = devm_clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
|
|
@@ -246,11 +245,11 @@ static int raspberrypi_register_pllb_arm
|
|
return ret;
|
|
}
|
|
|
|
- pllb_arm_lookup = clkdev_hw_create(&raspberrypi_clk_pllb_arm.hw,
|
|
- NULL, "cpu0");
|
|
- if (!pllb_arm_lookup) {
|
|
- dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n");
|
|
- return -ENOMEM;
|
|
+ ret = clk_hw_register_clkdev(&raspberrypi_clk_pllb_arm.hw,
|
|
+ NULL, "cpu0");
|
|
+ if (ret) {
|
|
+ dev_err(rpi->dev, "Failed to initialize clkdev\n");
|
|
+ return ret;
|
|
}
|
|
|
|
return 0;
|