Merge tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

From Linus Walleij:
- U9540 boot regression fix due to new clock framework
- Configure out the yet instable battery management driver
- Adjust cache initilization per SoC family

* tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Fix u9540 booting issues
  ARM: ux500: add spin_unlock(&master_lock).
  ARM: ux500: Disable Power Supply and Battery Management by default

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 721e7b4275f3..d4dcec53171a 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();
 }
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index b54884bd2549..ce9149302cc3 100644
--- a/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@ -40,8 +40,10 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev,
                         goto wfi;
 
                 /* decouple the gic from the A9 cores */
-                if (prcmu_gic_decouple())
+                if (prcmu_gic_decouple()) {
+                        spin_unlock(&master_lock);
                         goto out;
+                }
 
                 /* If an error occur, we will have to recouple the gic
                  * manually */