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.
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From aeb75ab90c35c7bd9778a71d606d52ac3e8ff02d Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 7 Feb 2020 15:42:40 +0100
|
|
Subject: [PATCH] clk: bcm: rpi: Make sure pllb_arm is removed
|
|
|
|
The pllb_arm clock was created at probe time, but was never removed if
|
|
something went wrong later in probe, or if the driver was ever removed from
|
|
the system.
|
|
|
|
Now that we are using clk_hw_register, we can just use its managed variant
|
|
to take care of that for us.
|
|
|
|
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 | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-raspberrypi.c
|
|
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
|
@@ -240,7 +240,7 @@ static int raspberrypi_register_pllb_arm
|
|
{
|
|
int ret;
|
|
|
|
- ret = clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
|
|
+ ret = devm_clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
|
|
if (ret) {
|
|
dev_err(rpi->dev, "Failed to initialize pllb_arm\n");
|
|
return ret;
|
|
@@ -250,7 +250,6 @@ static int raspberrypi_register_pllb_arm
|
|
NULL, "cpu0");
|
|
if (!rpi->pllb_arm_lookup) {
|
|
dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n");
|
|
- clk_hw_unregister_fixed_factor(&raspberrypi_clk_pllb_arm.hw);
|
|
return -ENOMEM;
|
|
}
|
|
|