From 76c4e631d0bca7425c59bf106f98aeca4fef6574 Mon Sep 17 00:00:00 2001
From: Cong Ding <dinggnu@gmail.com>
Date: Fri, 18 Jan 2013 08:58:23 -0800
Subject: [PATCH] --- yaml --- r: 355120 b: refs/heads/master c:
 813f13e7d6ad239bb1003041f4cfae13ae27b14d h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/configs/u8500_defconfig | 6 +++---
 trunk/arch/arm/mach-s3c24xx/common.c   | 2 +-
 trunk/arch/arm/mach-ux500/cpu.c        | 6 ++++--
 trunk/arch/arm/mach-ux500/cpuidle.c    | 4 +---
 trunk/drivers/mfd/vexpress-sysreg.c    | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 1d46f2dc16fe..2f459bc9f4fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e065d3d417274bafed162b3dffd2e03a5128623c
+refs/heads/master: 813f13e7d6ad239bb1003041f4cfae13ae27b14d
diff --git a/trunk/arch/arm/configs/u8500_defconfig b/trunk/arch/arm/configs/u8500_defconfig
index 426270fe080d..231dca604737 100644
--- a/trunk/arch/arm/configs/u8500_defconfig
+++ b/trunk/arch/arm/configs/u8500_defconfig
@@ -66,9 +66,9 @@ CONFIG_SPI=y
 CONFIG_SPI_PL022=y
 CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TC3589X=y
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_AB8500_BM is not set
-# CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL is not set
+CONFIG_POWER_SUPPLY=y
+CONFIG_AB8500_BM=y
+CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y
 CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y
 CONFIG_MFD_STMPE=y
diff --git a/trunk/arch/arm/mach-s3c24xx/common.c b/trunk/arch/arm/mach-s3c24xx/common.c
index 0c9e9a785ef6..6bcf87f65f9e 100644
--- a/trunk/arch/arm/mach-s3c24xx/common.c
+++ b/trunk/arch/arm/mach-s3c24xx/common.c
@@ -197,7 +197,7 @@ static unsigned long s3c24xx_read_idcode_v4(void)
 
 static void s3c24xx_default_idle(void)
 {
-	unsigned long tmp;
+	unsigned long tmp = 0;
 	int i;
 
 	/* idle the system by using the idle mode which will wait for an
diff --git a/trunk/arch/arm/mach-ux500/cpu.c b/trunk/arch/arm/mach-ux500/cpu.c
index d4dcec53171a..721e7b4275f3 100644
--- a/trunk/arch/arm/mach-ux500/cpu.c
+++ b/trunk/arch/arm/mach-ux500/cpu.c
@@ -71,11 +71,13 @@ void __init ux500_init_irq(void)
 	 * Init clocks here so that they are available for system timer
 	 * initialization.
 	 */
-	if (cpu_is_u8500_family() || cpu_is_u9540())
+	if (cpu_is_u8500_family())
 		db8500_prcmu_early_init();
 
-	if (cpu_is_u8500_family() || cpu_is_u9540())
+	if (cpu_is_u8500_family())
 		u8500_clk_init();
+	else if (cpu_is_u9540())
+		u9540_clk_init();
 	else if (cpu_is_u8540())
 		u8540_clk_init();
 }
diff --git a/trunk/arch/arm/mach-ux500/cpuidle.c b/trunk/arch/arm/mach-ux500/cpuidle.c
index ce9149302cc3..b54884bd2549 100644
--- a/trunk/arch/arm/mach-ux500/cpuidle.c
+++ b/trunk/arch/arm/mach-ux500/cpuidle.c
@@ -40,10 +40,8 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev,
 			goto wfi;
 
 		/* decouple the gic from the A9 cores */
-		if (prcmu_gic_decouple()) {
-			spin_unlock(&master_lock);
+		if (prcmu_gic_decouple())
 			goto out;
-		}
 
 		/* If an error occur, we will have to recouple the gic
 		 * manually */
diff --git a/trunk/drivers/mfd/vexpress-sysreg.c b/trunk/drivers/mfd/vexpress-sysreg.c
index 558c2928f261..77048b18439e 100644
--- a/trunk/drivers/mfd/vexpress-sysreg.c
+++ b/trunk/drivers/mfd/vexpress-sysreg.c
@@ -313,7 +313,7 @@ static void vexpress_sysreg_config_complete(unsigned long data)
 }
 
 
-void vexpress_sysreg_setup(struct device_node *node)
+void __init vexpress_sysreg_setup(struct device_node *node)
 {
 	if (WARN_ON(!vexpress_sysreg_base))
 		return;