rp1: clk: Remove CLK_IGNORE_UNUSED flags

There should be no issue in disabling the RP1 clocks as long as the kernel knows about all consumers. Signed-off-by: Dave Stevenson <[email protected]>
raspberrypi · Nov 11, 2024 · 6bf48c4 · 6bf48c4
1 parent f6b7f74
commit 6bf48c4
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/drivers/clk/clk-rp1.c b/drivers/clk/clk-rp1.c
@@ -1551,7 +1551,7 @@ static struct clk_hw *rp1_register_pll(struct rp1_clockman *clockman,
 	init.num_parents = 1;
 	init.name = pll_data->name;
 	init.ops = &rp1_pll_ops;
-	init.flags = pll_data->flags | CLK_IGNORE_UNUSED;
+	init.flags = pll_data->flags;
 
 	pll = kzalloc(sizeof(*pll), GFP_KERNEL);
 	if (!pll)
@@ -1585,7 +1585,7 @@ static struct clk_hw *rp1_register_pll_ph(struct rp1_clockman *clockman,
 	init.num_parents = 1;
 	init.name = ph_data->name;
 	init.ops = &rp1_pll_ph_ops;
-	init.flags = ph_data->flags | CLK_IGNORE_UNUSED;
+	init.flags = ph_data->flags;
 
 	ph = kzalloc(sizeof(*ph), GFP_KERNEL);
 	if (!ph)
@@ -1618,7 +1618,7 @@ static struct clk_hw *rp1_register_pll_divider(struct rp1_clockman *clockman,
 	init.num_parents = 1;
 	init.name = divider_data->name;
 	init.ops = &rp1_pll_divider_ops;
-	init.flags = divider_data->flags | CLK_IGNORE_UNUSED;
+	init.flags = divider_data->flags;
 
 	divider = devm_kzalloc(clockman->dev, sizeof(*divider), GFP_KERNEL);
 	if (!divider)
@@ -1661,7 +1661,7 @@ static struct clk_hw *rp1_register_clock(struct rp1_clockman *clockman,
 	init.num_parents =
 		clock_data->num_std_parents + clock_data->num_aux_parents;
 	init.name = clock_data->name;
-	init.flags = clock_data->flags | CLK_IGNORE_UNUSED;
+	init.flags = clock_data->flags;
 	init.ops = &rp1_clk_ops;
 
 	clock = devm_kzalloc(clockman->dev, sizeof(*clock), GFP_KERNEL);
@@ -1691,7 +1691,6 @@ static struct clk_hw *rp1_register_varsrc(struct rp1_clockman *clockman,
 	init.parent_names = &ref_clock;
 	init.num_parents = 1;
 	init.name = name;
-	init.flags = CLK_IGNORE_UNUSED;
 	init.ops = &rp1_varsrc_ops;
 
 	clock = devm_kzalloc(clockman->dev, sizeof(*clock), GFP_KERNEL);