diff options
Diffstat (limited to 'arch/arm/mach-mvf/clock.c')
| -rw-r--r-- | arch/arm/mach-mvf/clock.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mvf/clock.c b/arch/arm/mach-mvf/clock.c index bab52e75b600..c2b2edaf2c9c 100644 --- a/arch/arm/mach-mvf/clock.c +++ b/arch/arm/mach-mvf/clock.c @@ -1026,6 +1026,12 @@ static struct clk ipg_clk = { }; +static struct clk scu_clk = { + __INIT_CLK_DEBUG(scu_clk) + .parent = &periph_clk, +}; + + static int _clk_enet_set_parent(struct clk *clk, struct clk *parent) { int mux; @@ -1939,6 +1945,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk), /* arm core clk */ _REGISTER_CLOCK(NULL, "periph_clk", periph_clk), /* platform bus clk */ _REGISTER_CLOCK(NULL, "ipg_clk", ipg_clk), + _REGISTER_CLOCK(NULL, "scu_clk", scu_clk), _REGISTER_CLOCK(NULL, "audio ext clk", audio_external_clk), _REGISTER_CLOCK(NULL, "mvf-uart.0", uart_clk[0]), _REGISTER_CLOCK(NULL, "mvf-uart.1", uart_clk[0]), @@ -2018,9 +2025,14 @@ int __init mvf_clocks_init(unsigned long ckil, unsigned long osc, #endif clk_enable(&pll3_usb_otg_main_clk); +#ifdef CONFIG_MXC_USE_PIT base = MVF_IO_ADDRESS(MVF_PIT_BASE_ADDR); pit_timer_init(&pit_clk, base, MVF_INT_PIT); +#else + base = MVF_IO_ADDRESS(MVF_SCUGIC_BASE_ADDR + 0x200); + global_timer_init(&scu_clk, base, MVF_INT_GLOBAL_TIMER); +#endif /*clk_set_parent(&enet_clk, &pll5_enet_main_clk);*/ |