clk: add common of_clk_init() function

Use common of_clk_init() function for clocks initialization.

 drivers/clk/tegra/clk-tegra20.c |    3 ++-
 drivers/clk/tegra/clk-tegra30.c |    3 ++-

Quoted 3 lines · Prashant Gaikwad

Use common of_clk_init() function for clocks initialization.

  drivers/clk/tegra/clk-tegra20.c |    3 ++-
  drivers/clk/tegra/clk-tegra30.c |    3 ++-

Oh, so this series is written assuming that the Tegra CCF rework is already applied then? That makes the dependencies quite painful, since I think we'll end up with the following order being needed:

1) clk: Add composite clock type

    -> This would usually go through the clk tree.

2) The Tegra CCF rework series
-> This must go through the Tegra tree due to lots of dependencies and merge conflicts with other Tegra patches.
3) This series

    -> This would usually go through the clk tree.

Is it possible to re-order the dependencies as (1) (3) (2), so that Mike can apply (1) and (3) to the clock tree, then I can use the clk tree as the basis for a branch in the Tegra tree to apply (2) and all the other Tegra patches that will conflict with (2)?

Quoted 16 lines · Prashant Gaikwad

Quoted 3 lines

Use common of_clk_init() function for clocks initialization.

  drivers/clk/tegra/clk-tegra20.c |    3 ++-
  drivers/clk/tegra/clk-tegra30.c |    3 ++-

Oh, so this series is written assuming that the Tegra CCF rework is already applied then? That makes the dependencies quite painful, since I think we'll end up with the following order being needed:

1) clk: Add composite clock type

    -> This would usually go through the clk tree.

2) The Tegra CCF rework series
-> This must go through the Tegra tree due to lots of dependencies and merge conflicts with other Tegra patches.
3) This series

    -> This would usually go through the clk tree.

Quoted 4 lines

Is it possible to re-order the dependencies as (1) (3) (2), so that Mike can apply (1) and (3) to the clock tree, then I can use the clk tree as the basis for a branch in the Tegra tree to apply (2) and all the other Tegra patches that will conflict with (2)?

If Mike approves the concept and implementation in (1) and (3) then I will repost (2) and (3) with dependencies re-ordered.

Quoting Prashant Gaikwad (2013-01-04 18:44:48)

Quoted 22 lines · Stephen Warren

Quoted 20 lines · Prashant Gaikwad

Quoted 3 lines

Use common of_clk_init() function for clocks initialization.

  drivers/clk/tegra/clk-tegra20.c |    3 ++-
  drivers/clk/tegra/clk-tegra30.c |    3 ++-

Oh, so this series is written assuming that the Tegra CCF rework is already applied then? That makes the dependencies quite painful, since I think we'll end up with the following order being needed:

1) clk: Add composite clock type

    -> This would usually go through the clk tree.

2) The Tegra CCF rework series
-> This must go through the Tegra tree due to lots of dependencies and merge conflicts with other Tegra patches.
3) This series

    -> This would usually go through the clk tree.

Is it possible to re-order the dependencies as (1) (3) (2), so that Mike can apply (1) and (3) to the clock tree, then I can use the clk tree as the basis for a branch in the Tegra tree to apply (2) and all the other Tegra patches that will conflict with (2)?

Quoted 2 lines

If Mike approves the concept and implementation in (1) and (3) then I will repost (2) and (3) with dependencies re-ordered.

Patch (1) still has some unaddressed comments, and is not a real dependency for this series.

Since all of the patches have received their
Tested-by's then I propose to merge all patches from this series into clk-next, which exception of patch 2/7 (the Tegra patch).

This reduces your Tegra CCF conversion dependencies and you can role the necessary of_clk_init change into your Tegra CCF conversion branch (it has my implicit Ack and can be taken through your tree).

Let me know if this is OK for you.

Quoting Stephen Warren (2013-01-24 11:32:37)

Quoted 42 lines · Mike Turquette

Quoted 23 lines

Quoting Prashant Gaikwad (2013-01-04 18:44:48)

Quoted 22 lines · Stephen Warren

Quoted 20 lines · Prashant Gaikwad

Quoted 3 lines

Use common of_clk_init() function for clocks initialization.

  drivers/clk/tegra/clk-tegra20.c |    3 ++-
  drivers/clk/tegra/clk-tegra30.c |    3 ++-

Oh, so this series is written assuming that the Tegra CCF rework is already applied then? That makes the dependencies quite painful, since I think we'll end up with the following order being needed:

1) clk: Add composite clock type

    -> This would usually go through the clk tree.

2) The Tegra CCF rework series
-> This must go through the Tegra tree due to lots of dependencies and merge conflicts with other Tegra patches.
3) This series

    -> This would usually go through the clk tree.

Is it possible to re-order the dependencies as (1) (3) (2), so that Mike can apply (1) and (3) to the clock tree, then I can use the clk tree as the basis for a branch in the Tegra tree to apply (2) and all the other Tegra patches that will conflict with (2)?

Quoted 5 lines

Quoted 2 lines

If Mike approves the concept and implementation in (1) and (3) then I will repost (2) and (3) with dependencies re-ordered.

Patch (1) still has some unaddressed comments, and is not a real dependency for this series.

I assume "Patch (1)" refers to the list of series a couple emails above, not the first patch in the series you're replying to; that threw me for a moment.

Quoted 8 lines

Since all of the patches have received their
Tested-by's then I propose to merge all patches from this series into clk-next, which exception of patch 2/7 (the Tegra patch).

This reduces your Tegra CCF conversion dependencies and you can role the necessary of_clk_init change into your Tegra CCF conversion branch (it has my implicit Ack and can be taken through your tree).

Quoted 4 lines

Quoted 1 line

Let me know if this is OK for you.

OK, I'm happy to merge your clock tree into the Tegra tree and then apply 2/7 on top of the Tegra CCF work.

Hmm, maybe the clk tree needs to be a dependency branch of arm-soc again, as it has in the past. Would that help with any Tegra merge pain?

Quoted 40 lines · Mike Turquette

Quoting Stephen Warren (2013-01-24 11:32:37)

Quoted 39 lines · Mike Turquette

Quoted 18 lines

Quoting Prashant Gaikwad (2013-01-04 18:44:48)

Quoted 17 lines · Stephen Warren

Quoted 16 lines · Prashant Gaikwad

Quoted 3 lines

Use common of_clk_init() function for clocks initialization.

   drivers/clk/tegra/clk-tegra20.c |    3 ++-
   drivers/clk/tegra/clk-tegra30.c |    3 ++-

Oh, so this series is written assuming that the Tegra CCF rework is already applied then? That makes the dependencies quite painful, since I think we'll end up with the following order being needed:

1) clk: Add composite clock type

     -> This would usually go through the clk tree.

2) The Tegra CCF rework series
-> This must go through the Tegra tree due to lots of dependencies and merge conflicts with other Tegra patches.
3) This series

     -> This would usually go through the clk tree.

Quoted 8 lines

Quoted 6 lines

Quoted 4 lines

Is it possible to re-order the dependencies as (1) (3) (2), so that Mike can apply (1) and (3) to the clock tree, then I can use the clk tree as the basis for a branch in the Tegra tree to apply (2) and all the other Tegra patches that will conflict with (2)?

If Mike approves the concept and implementation in (1) and (3) then I will repost (2) and (3) with dependencies re-ordered.

Patch (1) still has some unaddressed comments, and is not a real dependency for this series.

I assume "Patch (1)" refers to the list of series a couple emails above, not the first patch in the series you're replying to; that threw me for a moment.

Quoted 8 lines

Since all of the patches have received their
Tested-by's then I propose to merge all patches from this series into clk-next, which exception of patch 2/7 (the Tegra patch).

This reduces your Tegra CCF conversion dependencies and you can role the necessary of_clk_init change into your Tegra CCF conversion branch (it has my implicit Ack and can be taken through your tree).

Quoted 6 lines

Quoted 3 lines

Quoted 1 line

Let me know if this is OK for you.

OK, I'm happy to merge your clock tree into the Tegra tree and then apply 2/7 on top of the Tegra CCF work.

Hmm, maybe the clk tree needs to be a dependency branch of arm-soc again, as it has in the past. Would that help with any Tegra merge pain?

Yes, I think that's what would end up happening if I merge the clk tree into the Tegra tree anyway.

Quoted 47 lines · Mike Turquette

Quoted 46 lines

Quoting Stephen Warren (2013-01-24 11:32:37)

Quoted 35 lines · Mike Turquette

Quoted 18 lines

Quoting Prashant Gaikwad (2013-01-04 18:44:48)

Quoted 17 lines · Stephen Warren

Quoted 16 lines · Prashant Gaikwad

Quoted 3 lines

Use common of_clk_init() function for clocks initialization.

   drivers/clk/tegra/clk-tegra20.c |    3 ++-
   drivers/clk/tegra/clk-tegra30.c |    3 ++-

Oh, so this series is written assuming that the Tegra CCF rework is already applied then? That makes the dependencies quite painful, since I think we'll end up with the following order being needed:

1) clk: Add composite clock type

     -> This would usually go through the clk tree.

2) The Tegra CCF rework series
-> This must go through the Tegra tree due to lots of dependencies and merge conflicts with other Tegra patches.
3) This series

     -> This would usually go through the clk tree.

Quoted 8 lines

Quoted 6 lines

Quoted 4 lines

Is it possible to re-order the dependencies as (1) (3) (2), so that Mike can apply (1) and (3) to the clock tree, then I can use the clk tree as the basis for a branch in the Tegra tree to apply (2) and all the other Tegra patches that will conflict with (2)?

If Mike approves the concept and implementation in (1) and (3) then I will repost (2) and (3) with dependencies re-ordered.

Patch (1) still has some unaddressed comments, and is not a real dependency for this series.

I assume "Patch (1)" refers to the list of series a couple emails above, not the first patch in the series you're replying to; that threw me for a moment.

Quoted 4 lines

Since all of the patches have received their
Tested-by's then I propose to merge all patches from this series into clk-next, which exception of patch 2/7 (the Tegra patch).

Quoted 7 lines

Quoted 5 lines

This reduces your Tegra CCF conversion dependencies and you can role the necessary of_clk_init change into your Tegra CCF conversion branch (it has my implicit Ack and can be taken through your tree).

Let me know if this is OK for you.

OK, I'm happy to merge your clock tree into the Tegra tree and then apply 2/7 on top of the Tegra CCF work.

Hmm, maybe the clk tree needs to be a dependency branch of arm-soc again, as it has in the past. Would that help with any Tegra merge pain?

Quoted 2 lines

Yes, I think that's what would end up happening if I merge the clk tree into the Tegra tree anyway.

Hi Mike,

Have you merged these patches for 3.9?

Use common of_clk_init() function for clocks initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

---
 arch/arm/mach-highbank/core.h     |    1 -
 arch/arm/mach-highbank/highbank.c |    3 ++-
 drivers/clk/clk-highbank.c        |   18 ++++--------------
 3 files changed, 6 insertions(+), 16 deletions(-)

arch/arm/mach-highbank/core.h +0 -1

index 80235b4..3f65206 100644
@@ -2,7 +2,6 @@
 #define __HIGHBANK_CORE_H
 
 extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
-extern void highbank_clocks_init(void);
 extern void highbank_restart(char, const char *);
 extern void __iomem *scu_base_addr;
 

arch/arm/mach-highbank/highbank.c +2 -1

index f6ca285..fb148da 100644
@@ -25,6 +25,7 @@
 #include <linux/of_address.h>
 #include <linux/smp.h>
 #include <linux/amba/bus.h>
+#include <linux/clk-provider.h>
 
 #include <asm/arch_timer.h>
 #include <asm/cacheflush.h>

@@ -116,7 +117,7 @@ static void __init highbank_timer_init(void)
        WARN_ON(!timer_base);
        irq = irq_of_parse_and_map(np, 0);
 
-       highbank_clocks_init();
+       of_clk_init(NULL);
        lookup.clk = of_clk_get(np, 0);
        clkdev_add(&lookup);
 

drivers/clk/clk-highbank.c +4 -14

index 52fecad..5d1de2e 100644
@@ -314,33 +314,23 @@ static void __init hb_pll_init(struct device_node *node)
 {
        hb_clk_init(node, &clk_pll_ops);
 }
+CLK_OF_DECLARE(hb_pll, "calxeda,hb-pll-clock", hb_pll_init);
 
 static void __init hb_a9periph_init(struct device_node *node)
 {
        hb_clk_init(node, &a9periphclk_ops);
 }
+CLK_OF_DECLARE(hb_a9periph, "calxeda,hb-a9periph-clock", hb_a9periph_init);
 
 static void __init hb_a9bus_init(struct device_node *node)
 {
        struct clk *clk = hb_clk_init(node, &a9bclk_ops);
        clk_prepare_enable(clk);
 }
+CLK_OF_DECLARE(hb_a9bus, "calxeda,hb-a9bus-clock", hb_a9bus_init);
 
 static void __init hb_emmc_init(struct device_node *node)
 {
        hb_clk_init(node, &periclk_ops);
 }
-
-static const __initconst struct of_device_id clk_match[] = {
-       { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-       { .compatible = "calxeda,hb-pll-clock", .data = hb_pll_init, },
-       { .compatible = "calxeda,hb-a9periph-clock", .data = hb_a9periph_init, },
-       { .compatible = "calxeda,hb-a9bus-clock", .data = hb_a9bus_init, },
-       { .compatible = "calxeda,hb-emmc-clock", .data = hb_emmc_init, },
-       {}
-};
-
-void __init highbank_clocks_init(void)
-{
-       of_clk_init(clk_match);
-}
+CLK_OF_DECLARE(hb_emmc, "calxeda,hb-emmc-clock", hb_emmc_init);

Signature · 1 line

1.7.4.1

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

---
 drivers/clk/clk-vt8500.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

drivers/clk/clk-vt8500.c +4 -11

index fe25570..3ce1c3e 100644
@@ -272,7 +272,7 @@ static __init void vtwm_device_clk_init(struct device_node *node)
        rc = of_clk_add_provider(node, of_clk_src_simple_get, clk);
        clk_register_clkdev(clk, clk_name, NULL);
 }
-
+CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init);
 
 /* PLL clock related functions */
 

@@ -502,20 +502,13 @@ static void __init vt8500_pll_init(struct device_node *node)
 {
        vtwm_pll_clk_init(node, PLL_TYPE_VT8500);
 }
+CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init);
 
 static void __init wm8650_pll_init(struct device_node *node)
 {
        vtwm_pll_clk_init(node, PLL_TYPE_WM8650);
 }
-
-static const __initconst struct of_device_id clk_match[] = {
-       { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-       { .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, },
-       { .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, },
-       { .compatible = "via,vt8500-device-clock",
-                                       .data = vtwm_device_clk_init, },
-       { /* sentinel */ }
-};
+CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init);
 
 void __init vtwm_clk_init(void __iomem *base)
 {

@@ -524,5 +517,5 @@ void __init vtwm_clk_init(void __iomem *base)
 
        pmc_base = base;
 
-       of_clk_init(clk_match);
+       of_clk_init(NULL);
 }

Signature · 1 line

1.7.4.1

Quoting Prashant Gaikwad (2013-01-03 23:00:56)

Quoted 3 lines

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

Tony,

Can I get a Tested-by from you before I take this in?

Thanks,
Mike

Quoted 49 lines

---
 drivers/clk/clk-vt8500.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

drivers/clk/clk-vt8500.c +4 -11

index fe25570..3ce1c3e 100644
@@ -272,7 +272,7 @@ static __init void vtwm_device_clk_init(struct device_node *node)
        rc = of_clk_add_provider(node, of_clk_src_simple_get, clk);
        clk_register_clkdev(clk, clk_name, NULL);
 }
-
+CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init);
 
 /* PLL clock related functions */
 

@@ -502,20 +502,13 @@ static void __init vt8500_pll_init(struct device_node *node)
 {
        vtwm_pll_clk_init(node, PLL_TYPE_VT8500);
 }
+CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init);
 
 static void __init wm8650_pll_init(struct device_node *node)
 {
        vtwm_pll_clk_init(node, PLL_TYPE_WM8650);
 }
-
-static const __initconst struct of_device_id clk_match[] = {
-       { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-       { .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, },
-       { .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, },
-       { .compatible = "via,vt8500-device-clock",
-                                       .data = vtwm_device_clk_init, },
-       { /* sentinel */ }
-};
+CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init);
 
 void __init vtwm_clk_init(void __iomem *base)
 {

@@ -524,5 +517,5 @@ void __init vtwm_clk_init(void __iomem *base)
 
        pmc_base = base;
 
-       of_clk_init(clk_match);
+       of_clk_init(NULL);
 }

Signature · 1 line

1.7.4.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 5 lines

Quoting Prashant Gaikwad (2013-01-03 23:00:56)

Quoted 3 lines

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

Quoted 4 lines

Tony,

Can I get a Tested-by from you before I take this in?

Tested-by Tony Prisk <[email protected]>

FYI: This will need another patch to complete as we added another set of clocks to this clk-vt8500.c for 3.9.

From 5b6e0adb69674c684c33503f50010644b049029c Mon Sep 17 00:00:00 2001

Quoting Tony Prisk (2013-01-18 13:08:00)

Quoted 6 lines · Mike Turquette

Quoted 5 lines

Quoting Prashant Gaikwad (2013-01-03 23:00:56)

Quoted 3 lines

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

Quoted 9 lines

Quoted 4 lines

Tony,

Can I get a Tested-by from you before I take this in?

Tested-by Tony Prisk <[email protected]>

FYI: This will need another patch to complete as we added another set of clocks to this clk-vt8500.c for 3.9.

Tony, is the following patch correct?

From 5b6e0adb69674c684c33503f50010644b049029c Mon Sep 17 00:00:00 2001
From: Prashant Gaikwad <[email protected]>
Date: Fri, 4 Jan 2013 12:30:56 +0530
Subject: [PATCH] clk: vt8500: Use common of_clk_init() function

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

Tested-by Tony Prisk <[email protected]>

Signed-off-by Mike Turquette <[email protected]>

[[email protected]: added entry for wm8750-pll-clock]

Signed-off-by Mike Turquette <[email protected]>

---
 drivers/clk/clk-vt8500.c |   17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

drivers/clk/clk-vt8500.c +4 -11

index 2515d4f..b5538bb 100644
@@ -291,7 +291,7 @@ static __init void vtwm_device_clk_init(struct device_node *node)
 	rc = of_clk_add_provider(node, of_clk_src_simple_get, clk);
 	clk_register_clkdev(clk, clk_name, NULL);
 }
-
+CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init);
 
 /* PLL clock related functions */
 

@@ -612,26 +612,19 @@ static void __init vt8500_pll_init(struct device_node *node)
 {
 	vtwm_pll_clk_init(node, PLL_TYPE_VT8500);
 }
+CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init);
 
 static void __init wm8650_pll_init(struct device_node *node)
 {
 	vtwm_pll_clk_init(node, PLL_TYPE_WM8650);
 }
+CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init);
 
 static void __init wm8750_pll_init(struct device_node *node)
 {
 	vtwm_pll_clk_init(node, PLL_TYPE_WM8750);
 }
-
-static const __initconst struct of_device_id clk_match[] = {
-	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-	{ .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, },
-	{ .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, },
-	{ .compatible = "wm,wm8750-pll-clock", .data = wm8750_pll_init, },
-	{ .compatible = "via,vt8500-device-clock",
-					.data = vtwm_device_clk_init, },
-	{ /* sentinel */ }
-};
+CLK_OF_DECLARE(wm8750_pll, "wm,wm8750-pll-clock", wm8750_pll_init);
 
 void __init vtwm_clk_init(void __iomem *base)
 {

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

---
 drivers/clk/versatile/clk-vexpress-osc.c |    1 +
 drivers/clk/versatile/clk-vexpress.c     |    8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

drivers/clk/versatile/clk-vexpress-osc.c +1 -0

index dcb6ae0..256c8be 100644
@@ -144,3 +144,4 @@ error:
                vexpress_config_func_put(osc->func);
        kfree(osc);
 }
+CLK_OF_DECLARE(vexpress_soc, "arm,vexpress-osc", vexpress_osc_of_setup);

drivers/clk/versatile/clk-vexpress.c +1 -7

index c742ac7..f889f2f 100644
@@ -99,19 +99,13 @@ struct clk *vexpress_sp810_of_get(struct of_phandle_args *clkspec, void *data)
        return vexpress_sp810_timerclken[clkspec->args[0]];
 }
 
-static const __initconst struct of_device_id vexpress_fixed_clk_match[] = {
-       { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-       { .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, },
-       {}
-};
-
 void __init vexpress_clk_of_init(void)
 {
        struct device_node *node;
        struct clk *clk;
        struct clk *refclk, *timclk;
 
-       of_clk_init(vexpress_fixed_clk_match);
+       of_clk_init(NULL);
 
        node = of_find_compatible_node(NULL, NULL, "arm,sp810");
        vexpress_sp810_init(of_iomap(node, 0));

Signature · 1 line

1.7.4.1

Quoting Prashant Gaikwad (2013-01-03 23:00:58)

Quoted 3 lines

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

Pawel or Linus,

Can I get a Tested-by before I take this series into clk-next?

Quoting Prashant Gaikwad (2013-01-03 23:00:58)

Quoted 3 lines

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

Pawel or Linus,

Can I get a Tested-by before I take this series into clk-next?

Use common of_clk_init() function for clock initialization.

Signed-off-by Prashant Gaikwad <[email protected]>

Modify of_clk_init function so that it will determine which driver to initialize based on device tree instead of each driver registering to it.

Based on a similar patch for drivers/irqchip by Thomas Petazzoni and drivers/clocksource by Stephen Warren.

Signed-off-by Prashant Gaikwad <[email protected]>

---

* PGP Signed by an unknown key

Quoted 9 lines · Prashant Gaikwad

Modify of_clk_init function so that it will determine which driver to initialize based on device tree instead of each driver registering to it.

Based on a similar patch for drivers/irqchip by Thomas Petazzoni and drivers/clocksource by Stephen Warren.

Signed-off-by Prashant Gaikwad <[email protected]>

---

Prashant-

Sorry for the late response, but I finally got a chance to give this patchset a spin on Zynq. For patches 1 and 6:

Reviewed-by Josh Cartwright <[email protected]>

Tested-by Josh Cartwright <[email protected]>

Josh

* Unknown Key
* 0x846F0FA5

Modify of_clk_init function so that it will determine which driver to initialize based on device tree instead of each driver registering to it.

Based on a similar patch for drivers/irqchip by Thomas Petazzoni and drivers/clocksource by Stephen Warren.

Modify of_clk_init function so that it will determine which driver to initialize based on device tree instead of each driver registering to it.

Based on a similar patch for drivers/irqchip by Thomas Petazzoni and drivers/clocksource by Stephen Warren.

Signed-off-by Prashant Gaikwad <[email protected]>

---

 drivers/clk/clk-fixed-rate.c      |    1 +
 drivers/clk/clk.c                 |    9 +++++++++
 include/asm-generic/vmlinux.lds.h |   10 ++++++++++
 include/linux/clk-provider.h      |    6 ++++++
 4 files changed, 26 insertions(+), 0 deletions(-)

drivers/clk/clk-fixed-rate.c +1 -0

index af78ed6..f2104df 100644
@@ -101,4 +101,5 @@ void __init of_fixed_clk_setup(struct device_node *node)
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
 }
 EXPORT_SYMBOL_GPL(of_fixed_clk_setup);
+CLK_OF_DECLARE(fixed_clk, "fixed-clock", of_fixed_clk_setup);
 #endif

drivers/clk/clk.c +9 -0

index 037b48a..fb38dd8 100644
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/device.h>
+#include <linux/init.h>
 
 static DEFINE_SPINLOCK(enable_lock);
 static DEFINE_MUTEX(prepare_lock);

@@ -1805,6 +1806,11 @@ struct of_clk_provider {
 	void *data;
 };
 
+extern struct of_device_id __clk_of_table[];
+
+static const struct of_device_id __clk_of_table_sentinel
+	__used __section(__clk_of_table_end);
+
 static LIST_HEAD(of_clk_providers);
 static DEFINE_MUTEX(of_clk_lock);
 

@@ -1933,6 +1939,9 @@ void __init of_clk_init(const struct of_device_id *matches)
 {
 	struct device_node *np;
 
+	if (!matches)
+		matches = __clk_of_table;
+
 	for_each_matching_node(np, matches) {
 		const struct of_device_id *match = of_match_node(matches, np);
 		of_clk_init_cb_t clk_init_cb = match->data;

include/asm-generic/vmlinux.lds.h +10 -0

index 1e744c5..8282f7c 100644
@@ -158,6 +158,15 @@
 #define CLKSRC_OF_TABLES()
 #endif
 
+#ifdef CONFIG_COMMON_CLK
+#define CLK_OF_TABLES() . = ALIGN(8);				\
+			VMLINUX_SYMBOL(__clk_of_table) = .;	\
+			*(__clk_of_table)			\
+			*(__clk_of_table_end)
+#else
+#define CLK_OF_TABLES()
+#endif
+
 #define KERNEL_DTB()							\
 	STRUCT_ALIGN();							\
 	VMLINUX_SYMBOL(__dtb_start) = .;				\

@@ -502,6 +511,7 @@
 	CPU_DISCARD(init.rodata)					\
 	MEM_DISCARD(init.rodata)					\
 	CLKSRC_OF_TABLES()						\
+	CLK_OF_TABLES()							\
 	KERNEL_DTB()
 
 #define INIT_TEXT							\

include/linux/clk-provider.h +6 -0

index 4989b8a..7f197d7 100644
@@ -379,7 +379,13 @@ struct clk_onecell_data {
 };
 struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data);
 const char *of_clk_get_parent_name(struct device_node *np, int index);
+
 void of_clk_init(const struct of_device_id *matches);
 
+#define CLK_OF_DECLARE(name, compat, fn)			\
+	static const struct of_device_id __clk_of_table_##name	\
+		__used __section(__clk_of_table)		\
+		= { .compatible = compat, .data = fn };
+
 #endif /* CONFIG_COMMON_CLK */
 #endif /* CLK_PROVIDER_H */