Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

MIPS: JZ4740: Call jz4740_clock_init earlier

Browse Source 
Call jz4740_clock_init before any uses of jz4740_clock_bdata occur. This
is in preparation for replacing uses of that struct with calls to
clk_get_rate, which will allow the clocks to be migrated towards common
clock framework & devicetree.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: linux-mips@linux-mips.org
Cc: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10148/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Paul Burton 2015-05-24 16:11:32 +01:00 committed by Ralf Baechle
parent 44e08e7099
commit 1f4b840983
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/include/asm/mach-jz4740/clock.h
View File

@ -20,6 +20,8 @@ enum jz4740_wait_mode {
JZ4740_WAIT_MODE_SLEEP,
};
int jz4740_clock_init(void);
void jz4740_clock_set_wait_mode(enum jz4740_wait_mode mode);
void jz4740_clock_udc_enable_auto_suspend(void);

3
arch/mips/jz4740/clock.c
View File

@ -889,7 +889,7 @@ void jz4740_clock_resume(void)
JZ_CLOCK_GATE_TCU | JZ_CLOCK_GATE_DMAC | JZ_CLOCK_GATE_UART0);
}
static int jz4740_clock_init(void)
int jz4740_clock_init(void)
{
uint32_t val;
@ -921,4 +921,3 @@ static int jz4740_clock_init(void)
return 0;
}
arch_initcall(jz4740_clock_init);

2
arch/mips/jz4740/time.c
View File

@ -20,6 +20,7 @@
#include <linux/clockchips.h>
#include <linux/sched_clock.h>
#include <asm/mach-jz4740/clock.h>
#include <asm/mach-jz4740/irq.h>
#include <asm/mach-jz4740/timer.h>
#include <asm/time.h>
@ -115,6 +116,7 @@ void __init plat_time_init(void)
uint32_t clk_rate;
uint16_t ctrl;
jz4740_clock_init();
jz4740_timer_init();
clk_rate = jz4740_clock_bdata.ext_rate >> 4;