diff mbox

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

Message ID 1405162508-9835-1-git-send-email-zonque@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Mack July 12, 2014, 10:55 a.m. UTC
This is needed to instanciate fixed clocks in the DT.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 arch/arm/mach-omap2/board-generic.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Tony Lindgren July 23, 2014, 8:54 a.m. UTC | #1
* Daniel Mack <zonque@gmail.com> [140712 03:57]:
> 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
 
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> ---
>  arch/arm/mach-omap2/board-generic.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> index 5606fa2..39f154a 100644
> --- a/arch/arm/mach-omap2/board-generic.c
> +++ b/arch/arm/mach-omap2/board-generic.c
> @@ -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
>
Daniel Mack July 23, 2014, 9:17 a.m. UTC | #2
Hi Tony,

On 07/23/2014 10:54 AM, Tony Lindgren wrote:
> * Daniel Mack <zonque@gmail.com> [140712 03:57]:
>> 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 :)

> 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
Tero Kristo July 28, 2014, 11:46 a.m. UTC | #3
On 07/23/2014 11:54 AM, Tony Lindgren wrote:
> * Daniel Mack <zonque@gmail.com> [140712 03:57]:
>> 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

>
> Regards,
>
> Tony
>
>> Signed-off-by: Daniel Mack <zonque@gmail.com>
>> ---
>>   arch/arm/mach-omap2/board-generic.c | 8 ++++++++
>>   1 file changed, 8 insertions(+)
>>
>> diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
>> index 5606fa2..39f154a 100644
>> --- a/arch/arm/mach-omap2/board-generic.c
>> +++ b/arch/arm/mach-omap2/board-generic.c
>> @@ -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
>>
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 5606fa2..39f154a 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -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