Commit 1dd41664 authored Sep 17, 2013 by Lee Jones Committed by Linus Walleij Sep 26, 2013

ARM: ux500: Call appropriate clock initialisation based on DT or !DT booting



The ux500 platform will soon be converted to Device Tree only. When that
happens the old clock initialisation will be ripped out. In the meantime
however, we have to make a decision and call the appropriate
initialisation code manually.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent b44b6632

arch/arm/mach-ux500/cpu.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -78,6 +78,14 @@ void __init ux500_init_irq(void)
		if (cpu_is_u8500_family()) {
		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);
		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);

		if (of_have_populated_dt())
		u8500_of_clk_init(U8500_CLKRST1_BASE,
		U8500_CLKRST2_BASE,
		U8500_CLKRST3_BASE,
		U8500_CLKRST5_BASE,
		U8500_CLKRST6_BASE);
		else
		u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,
		U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,
		U8500_CLKRST6_BASE);