Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f4b8409 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: JZ4740: Call jz4740_clock_init earlier 



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: default avatarPaul 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 44e08e70

arch/mips/include/asm/mach-jz4740/clock.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

arch/mips/jz4740/clock.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

arch/mips/jz4740/time.c

+2 −0
Original line number Diff line number Diff line
@@ -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;