[PATCH] ARM: zynq: Move of_clk_init from clock driver

[PATCH] ARM: zynq: Move of_clk_init from clock driver

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

Move of_clk_init() from clock driver to enable
options not to use zynq clock driver.
Use for example fixed clock setting.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Based on http://www.spinics.net/lists/arm-kernel/msg298287.html
series

---
 arch/arm/mach-zynq/common.c | 1 +
 drivers/clk/zynq/clkc.c     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 93ea19b..8df35f3 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -68,6 +68,7 @@ static void __init zynq_timer_init(void)
 	zynq_early_slcr_init();

 	zynq_clock_init();
+	of_clk_init(NULL);
 	clocksource_of_init();
 }

diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 03052d6..c812b93 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -602,8 +602,6 @@ void __init zynq_clock_init(void)
 	of_node_put(slcr);
 	of_node_put(np);

-	of_clk_init(NULL);
-
 	return;

 np_err:
--
1.8.2.3


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] ARM: zynq: Move of_clk_init from clock driver

[Sören Brinkmann]

On Wed, Feb 05, 2014 at 03:56:37PM +0100, Michal Simek wrote:
> Move of_clk_init() from clock driver to enable
> options not to use zynq clock driver.
> Use for example fixed clock setting.
What is the use-case? Zynq w/o this driver makes no sense, IMHO. And
even if you wanna fake clocks, why would this driver prevent it? Just
replace all the input clocks with different ones and don't care about
what this driver does?

> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Based on http://www.spinics.net/lists/arm-kernel/msg298287.html
> series
> 
> ---
>  arch/arm/mach-zynq/common.c | 1 +
>  drivers/clk/zynq/clkc.c     | 2 --
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 93ea19b..8df35f3 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -68,6 +68,7 @@ static void __init zynq_timer_init(void)
>  	zynq_early_slcr_init();
> 
>  	zynq_clock_init();
> +	of_clk_init(NULL);
Now you have two clock init functions...

	Sören

Re: [PATCH] ARM: zynq: Move of_clk_init from clock driver

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1657 bytes --]

On 02/05/2014 04:41 PM, Sören Brinkmann wrote:
> On Wed, Feb 05, 2014 at 03:56:37PM +0100, Michal Simek wrote:
>> Move of_clk_init() from clock driver to enable
>> options not to use zynq clock driver.
>> Use for example fixed clock setting.
> What is the use-case? Zynq w/o this driver makes no sense, IMHO. And
> even if you wanna fake clocks, why would this driver prevent it? Just
> replace all the input clocks with different ones and don't care about
> what this driver does?

One case is supervisor for example.

> 
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>> Based on http://www.spinics.net/lists/arm-kernel/msg298287.html
>> series
>>
>> ---
>>  arch/arm/mach-zynq/common.c | 1 +
>>  drivers/clk/zynq/clkc.c     | 2 --
>>  2 files changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
>> index 93ea19b..8df35f3 100644
>> --- a/arch/arm/mach-zynq/common.c
>> +++ b/arch/arm/mach-zynq/common.c
>> @@ -68,6 +68,7 @@ static void __init zynq_timer_init(void)
>>  	zynq_early_slcr_init();
>>
>>  	zynq_clock_init();
>> +	of_clk_init(NULL);
> Now you have two clock init functions...

If I have two clock init functions now, what I had before?
You were calling of_clk_init from zynq_clock_init.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]