[PATCH] clk: pxa: fix pxa27x_clocks_init scope

[PATCH] clk: pxa: fix pxa27x_clocks_init scope

[Robert Jarzmik]

As pxa27x_clocks_init() is called from early boot stage, it has to be
reachable from pxa architecture code, as are pxa25x_clocks_init() and
pxa2xx_clock_init().

Remove the static declaration, which was introduced before the order
issue between clocks and the timer was discovered (ie. the clocks have
to be available before the timer, all of this before initcalls are
called).

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 drivers/clk/pxa/clk-pxa27x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c
index 5f9b54b..7f8f344 100644
--- a/drivers/clk/pxa/clk-pxa27x.c
+++ b/drivers/clk/pxa/clk-pxa27x.c
@@ -362,7 +362,7 @@ static void __init pxa27x_base_clocks_init(void)
 	clk_register_clk_pxa27x_lcd_base();
 }
 
-static int __init pxa27x_clocks_init(void)
+int __init pxa27x_clocks_init(void)
 {
 	pxa27x_base_clocks_init();
 	return clk_pxa_cken_init(pxa27x_clocks, ARRAY_SIZE(pxa27x_clocks));
-- 
2.1.0

Re: [PATCH] clk: pxa: fix pxa27x_clocks_init scope

[Stephen Boyd]

On 01/31/15 14:37, Robert Jarzmik wrote:
> As pxa27x_clocks_init() is called from early boot stage, it has to be
> reachable from pxa architecture code, as are pxa25x_clocks_init() and
> pxa2xx_clock_init().
>
> Remove the static declaration, which was introduced before the order
> issue between clocks and the timer was discovered (ie. the clocks have
> to be available before the timer, all of this before initcalls are
> called).
>
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

Is this supposed to go through the clk tree?

$ git grep pxa27x_clocks_init
drivers/clk/pxa/clk-pxa27x.c:static int __init pxa27x_clocks_init(void)
drivers/clk/pxa/clk-pxa27x.c:postcore_initcall(pxa27x_clocks_init);
drivers/clk/pxa/clk-pxa27x.c:   pxa27x_clocks_init();

Where's the early boot stage architecture calling code?

> ---
>  drivers/clk/pxa/clk-pxa27x.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c
> index 5f9b54b..7f8f344 100644
> --- a/drivers/clk/pxa/clk-pxa27x.c
> +++ b/drivers/clk/pxa/clk-pxa27x.c
> @@ -362,7 +362,7 @@ static void __init pxa27x_base_clocks_init(void)
>  	clk_register_clk_pxa27x_lcd_base();
>  }
>  
> -static int __init pxa27x_clocks_init(void)
> +int __init pxa27x_clocks_init(void)
>  {
>  	pxa27x_base_clocks_init();
>  	return clk_pxa_cken_init(pxa27x_clocks, ARRAY_SIZE(pxa27x_clocks));


-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] clk: pxa: fix pxa27x_clocks_init scope

[Robert Jarzmik]

Stephen Boyd <sboyd@codeaurora.org> writes:

> On 01/31/15 14:37, Robert Jarzmik wrote:
>> As pxa27x_clocks_init() is called from early boot stage, it has to be
>> reachable from pxa architecture code, as are pxa25x_clocks_init() and
>> pxa2xx_clock_init().
>>
>> Remove the static declaration, which was introduced before the order
>> issue between clocks and the timer was discovered (ie. the clocks have
>> to be available before the timer, all of this before initcalls are
>> called).
>>
>> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
>
> Is this supposed to go through the clk tree?
Ah you've got a point, it's a bit embarrassing, see below ...

> $ git grep pxa27x_clocks_init
> drivers/clk/pxa/clk-pxa27x.c:static int __init pxa27x_clocks_init(void)
> drivers/clk/pxa/clk-pxa27x.c:postcore_initcall(pxa27x_clocks_init);
> drivers/clk/pxa/clk-pxa27x.c:   pxa27x_clocks_init();
>
> Where's the early boot stage architecture calling code?
It's there :
 - https://lkml.org/lkml/2015/1/12/1057
 - which ended up here in pxa/for-next tree:
   https://github.com/rjarzmik/linux/commit/a494a74dc52532ed0cef4633db007a08f847a0a8

Which happens to be my tree ...

Please forget about this patch, I don't know how I ended up doing this patch
... lack of coffee probably.

Cheers.

-- 
Robert