diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-11-27 09:34:50 +0000 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-01-24 17:05:21 +0100 |
| commit | 579400166a744890b2a67ca21765b5b6dc649441 (patch) | |
| tree | 0a912b161b5b360758dc17c2ecea24dbd885adee /arch/arm/mach-ux500/cpu.c | |
| parent | 5cc23666c3766705aac716bc517353cce8d68464 (diff) | |
ARM: ux500: Fix u9540 booting issues
The u9540 stopped booting after the v3.7 merge window due to
a lack of common clk support and early PRCMU initialisation.
In this patch we rectify these issues, placing the u9540
development board back into a successfully booting state.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 721e7b4275f..d4dcec53171 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -71,13 +71,11 @@ void __init ux500_init_irq(void) * Init clocks here so that they are available for system timer * initialization. */ - if (cpu_is_u8500_family()) + if (cpu_is_u8500_family() || cpu_is_u9540()) db8500_prcmu_early_init(); - if (cpu_is_u8500_family()) + if (cpu_is_u8500_family() || cpu_is_u9540()) u8500_clk_init(); - else if (cpu_is_u9540()) - u9540_clk_init(); else if (cpu_is_u8540()) u8540_clk_init(); } |