From 57a680c8af77a41e839596018dfe71b2a59af556 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 27 Nov 2012 09:34:50 +0000 Subject: [PATCH] --- yaml --- r: 355117 b: refs/heads/master c: 579400166a744890b2a67ca21765b5b6dc649441 h: refs/heads/master i: 355115: 6fc3bcc5b13201948129e93207e753ca1f171443 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/cpu.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 51dd5d84db45..bcf39b35d823 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cc23666c3766705aac716bc517353cce8d68464 +refs/heads/master: 579400166a744890b2a67ca21765b5b6dc649441 diff --git a/trunk/arch/arm/mach-ux500/cpu.c b/trunk/arch/arm/mach-ux500/cpu.c index 721e7b4275f3..d4dcec53171a 100644 --- a/trunk/arch/arm/mach-ux500/cpu.c +++ b/trunk/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(); }