Skip to contentSkip to conversation

ARM: OMAP: generic: add call to of_clk_init()

PATCH New Daniel Mack 4 participants 4 messages Jul 12, 2014 – Jul 28, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Daniel Mack

author
#0 lore raw

PATCH 1/1 ARM: OMAP: generic: add call to of_clk_init()

This is needed to instanciate fixed clocks in the DT.

Signed-off-by Daniel Mack <[email protected]>
---
 arch/arm/mach-omap2/board-generic.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/mach-omap2/board-generic.c +8 -0
index 5606fa2..39f154a 100644
@@ -15,6 +15,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/irqdomain.h>
+#include <linux/clk-provider.h>
 
 #include <asm/mach/arch.h>
 

@@ -33,6 +34,11 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
 	{ }
 };
 
+static struct of_device_id clk_match[] __initdata = {
+	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+	{ }
+};
+
 static void __init omap_generic_init(void)
 {
 	omapdss_early_init_of();

@@ -40,6 +46,8 @@ static void __init omap_generic_init(void)
 	pdata_quirks_init(omap_dt_match_table);
 
 	omapdss_init_of();
+
+	of_clk_init(clk_match);
 }
 
 #ifdef CONFIG_SOC_OMAP2420
Signature · 1 line
1.9.3
maintainer
#1 lore raw

PATCH 1/1 ARM: OMAP: generic: add call to of_clk_init()

Quoted 1 line · Daniel Mack

This is needed to instanciate fixed clocks in the DT.

Makes sense to me. Does this fix some regression or hang that's needed for the -rc series?

Also would like to get an ack from Tero on this as the other clocks are initialized elsewhere.

Regards,

Tony

Quoted 41 lines
Signed-off-by Daniel Mack <[email protected]>
---
 arch/arm/mach-omap2/board-generic.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/mach-omap2/board-generic.c +8 -0
index 5606fa2..39f154a 100644
@@ -15,6 +15,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/irqdomain.h>
+#include <linux/clk-provider.h>
 
 #include <asm/mach/arch.h>
 

@@ -33,6 +34,11 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
 	{ }
 };
 
+static struct of_device_id clk_match[] __initdata = {
+	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+	{ }
+};
+
 static void __init omap_generic_init(void)
 {
 	omapdss_early_init_of();

@@ -40,6 +46,8 @@ static void __init omap_generic_init(void)
 	pdata_quirks_init(omap_dt_match_table);
 
 	omapdss_init_of();
+
+	of_clk_init(clk_match);
 }
 
 #ifdef CONFIG_SOC_OMAP2420
Signature · 1 line
1.9.3
#2 lore raw

PATCH 1/1 ARM: OMAP: generic: add call to of_clk_init()

Hi Tony,

Quoted 5 lines · Tony Lindgren
Quoted 1 line · Daniel Mack

This is needed to instanciate fixed clocks in the DT.

Makes sense to me. Does this fix some regression or hang that's needed for the -rc series?

No, it's a feature addition. No need to hurry :)

Quoted 2 lines

Also would like to get an ack from Tero on this as the other clocks are initialized elsewhere.

Ok, thanks. I'm open to alternative ways of course.

Thanks,
Daniel

NAK
#3 lore raw

PATCH 1/1 ARM: OMAP: generic: add call to of_clk_init()

In reply to Tony Lindgren
Quoted 8 lines · Tony Lindgren
Quoted 1 line · Daniel Mack

This is needed to instanciate fixed clocks in the DT.

Makes sense to me. Does this fix some regression or hang that's needed for the -rc series?

Also would like to get an ack from Tero on this as the other clocks are initialized elsewhere.

NAK.

Fixed-clocks are already supported through DT clock init. Doing this from board-generic will result in duplicate init calls (out of which one will fail silently.)

What are you trying to accomplish with this patch anyway?

-Tero

Quoted 46 lines

Regards,

Tony

Quoted 41 lines
Signed-off-by Daniel Mack <[email protected]>
---
  arch/arm/mach-omap2/board-generic.c | 8 ++++++++
  1 file changed, 8 insertions(+)
arch/arm/mach-omap2/board-generic.c +8 -1
index 5606fa2..39f154a 100644
@@ -15,6 +15,7 @@
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
  #include <linux/irqdomain.h>
+#include <linux/clk-provider.h>
 
  #include <asm/mach/arch.h>
 

@@ -33,6 +34,11 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
  	{ }
  };
 
+static struct of_device_id clk_match[] __initdata = {
+	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+	{ }
+};
+
  static void __init omap_generic_init(void)
  {
  	omapdss_early_init_of();

@@ -40,6 +46,8 @@ static void __init omap_generic_init(void)
  	pdata_quirks_init(omap_dt_match_table);
 
  	omapdss_init_of();
+
+	of_clk_init(clk_match);
  }
 
  #ifdef CONFIG_SOC_OMAP2420
--

1.9.3