2022-06-01 08:29:54

by Samuel Holland

[permalink] [raw]
Subject: [PATCH 1/2] clk: fixed: Remove Allwinner A10 special-case logic

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 <[email protected]>
---

drivers/clk/clk-fixed-factor.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index 54942d758ee6..e6b36247c16b 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -210,16 +210,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;

@@ -237,11 +231,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
--
2.35.1



2022-06-01 20:56:06

by Samuel Holland

[permalink] [raw]
Subject: [PATCH 2/2] dt-bindings: clock: fixed-factor: Drop Allwinner A10 compatible

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. Now that the code for this compatible has been removed,
let's drop the compatible.

Signed-off-by: Samuel Holland <[email protected]>
---

Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml | 1 -
1 file changed, 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml b/Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml
index f415845b38dd..0b02378a3a0c 100644
--- a/Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml
@@ -13,7 +13,6 @@ maintainers:
properties:
compatible:
enum:
- - allwinner,sun4i-a10-pll3-2x-clk
- fixed-factor-clock

"#clock-cells":
--
2.35.1


2022-06-06 05:51:44

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH 2/2] dt-bindings: clock: fixed-factor: Drop Allwinner A10 compatible

On Tue, 31 May 2022 00:17:42 -0500, Samuel Holland wrote:
> 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. Now that the code for this compatible has been removed,
> let's drop the compatible.
>
> Signed-off-by: Samuel Holland <[email protected]>
> ---
>
> Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml | 1 -
> 1 file changed, 1 deletion(-)
>

Acked-by: Rob Herring <[email protected]>

2022-06-09 23:03:33

by Stephen Boyd

[permalink] [raw]
Subject: Re: [PATCH 1/2] clk: fixed: Remove Allwinner A10 special-case logic

Quoting Samuel Holland (2022-05-30 22:17:41)
> 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 <[email protected]>
> ---

Applied to clk-next

2022-06-09 23:09:05

by Stephen Boyd

[permalink] [raw]
Subject: Re: [PATCH 2/2] dt-bindings: clock: fixed-factor: Drop Allwinner A10 compatible

Quoting Samuel Holland (2022-05-30 22:17:42)
> 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. Now that the code for this compatible has been removed,
> let's drop the compatible.
>
> Signed-off-by: Samuel Holland <[email protected]>
> ---

Applied to clk-next