From 1e61f60592b758c5c3e6df821ae184c5a5247803 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 5 Nov 2012 16:10:36 +0100
Subject: [PATCH] --- yaml --- r: 344958 b: refs/heads/master c:
 b851c06c241d4a2e43ee6007705765a9b1b3abb7 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/db8500-prcmu.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c33156000210..6551be22b32a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c4203cb5814f53169dc4ff084a65dcf509b6f60
+refs/heads/master: b851c06c241d4a2e43ee6007705765a9b1b3abb7
diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c
index 00b8b0f3dfb6..c56ceddf8581 100644
--- a/trunk/drivers/mfd/db8500-prcmu.c
+++ b/trunk/drivers/mfd/db8500-prcmu.c
@@ -2711,7 +2711,7 @@ static int db8500_irq_init(struct device_node *np)
 
 void __init db8500_prcmu_early_init(void)
 {
-	if (cpu_is_u8500v2()) {
+	if (cpu_is_u8500v2() || cpu_is_u9540()) {
 		void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
 
 		if (tcpm_base != NULL) {
@@ -2729,7 +2729,11 @@ void __init db8500_prcmu_early_init(void)
 			iounmap(tcpm_base);
 		}
 
-		tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
+		if (cpu_is_u9540())
+			tcdm_base = ioremap_nocache(U8500_PRCMU_TCDM_BASE,
+						SZ_4K + SZ_8K) + SZ_8K;
+		else
+			tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
 	} else {
 		pr_err("prcmu: Unsupported chip version\n");
 		BUG();