diff mbox series

[5.10.y-cip,05/11] clk: fixed: Remove Allwinner A10 special-case logic

Message ID 20231122142819.203737-6-biju.das.jz@bp.renesas.com (mailing list archive)
State Accepted
Headers show
Series Add versa3 clk generator support | expand

Commit Message

Biju Das Nov. 22, 2023, 2:28 p.m. UTC 
From: Samuel Holland <samuel@sholland.org>

commit c33ed61249dc54e7cf2137c04462883560375b77 upstream.

This compatible is part of the legacy sunxi clock support, and has not
been used since commit 6b48644b1d29 ("ARM: gr8: Convert to CCU") in
October 2016. Since supporting this compatible adds some overhead to
generic clock code, let's clean it up.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Link: https://lore.kernel.org/r/20220531051742.43273-1-samuel@sholland.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 drivers/clk/clk-fixed-factor.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Comments

Pavel Machek Nov. 22, 2023, 9:04 p.m. UTC | #1 
Hi!

> From: Samuel Holland <samuel@sholland.org>
> 
> commit c33ed61249dc54e7cf2137c04462883560375b77 upstream.
> 
> This compatible is part of the legacy sunxi clock support, and has not
> been used since commit 6b48644b1d29 ("ARM: gr8: Convert to CCU") in
> October 2016. Since supporting this compatible adds some overhead to
> generic clock code, let's clean it up.

> +++ b/drivers/clk/clk-fixed-factor.c
> @@ -203,16 +203,10 @@ struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev,
>  EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor);
>  
>  #ifdef CONFIG_OF
> -static const struct of_device_id set_rate_parent_matches[] = {
> -	{ .compatible = "allwinner,sun4i-a10-pll3-2x-clk" },
> -	{ /* Sentinel */ },
> -};

This is still mentioned in
Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml.

Best regards,
								Pavel
diff mbox series

Patch

diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index b65f027dd40c..67229bfec4c0 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -203,16 +203,10 @@  struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev,
 EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor);
 
 #ifdef CONFIG_OF
-static const struct of_device_id set_rate_parent_matches[] = {
-	{ .compatible = "allwinner,sun4i-a10-pll3-2x-clk" },
-	{ /* Sentinel */ },
-};
-
 static struct clk_hw *_of_fixed_factor_clk_setup(struct device_node *node)
 {
 	struct clk_hw *hw;
 	const char *clk_name = node->name;
-	unsigned long flags = 0;
 	u32 div, mult;
 	int ret;
 
@@ -230,11 +224,8 @@  static struct clk_hw *_of_fixed_factor_clk_setup(struct device_node *node)
 
 	of_property_read_string(node, "clock-output-names", &clk_name);
 
-	if (of_match_node(set_rate_parent_matches, node))
-		flags |= CLK_SET_RATE_PARENT;
-
 	hw = __clk_hw_register_fixed_factor(NULL, node, clk_name, NULL, 0,
-					    flags, mult, div, false);
+					    0, mult, div, false);
 	if (IS_ERR(hw)) {
 		/*
 		 * Clear OF_POPULATED flag so that clock registration can be