From 533a00bf128fbe700d2d2e7514712f4d4028a510 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Fri, 11 Jun 2010 01:52:35 +0000
Subject: [PATCH] --- yaml --- r: 200435 b: refs/heads/master c:
 fb73538e10c7fc4823a56e97bba600c2f9294012 h: refs/heads/master i:   200433:
 37ccf5a680ac817ba6a22f1c5423235f82a80191   200431:
 3bed0f5abad13f03e49637f6fc4da97c8c10efd2 v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/powerpc/platforms/52xx/mpc52xx_pm.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b15fd978db65..27db22b0885c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2c9a603c72be0d9a0780f196bff53ab0d517347
+refs/heads/master: fb73538e10c7fc4823a56e97bba600c2f9294012
diff --git a/trunk/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/trunk/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index a55b0b6813ed..76722532bd95 100644
--- a/trunk/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/trunk/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -64,10 +64,19 @@ int mpc52xx_pm_prepare(void)
 		{ .type = "builtin", .compatible = "mpc5200", }, /* efika */
 		{}
 	};
+	struct resource res;
 
 	/* map the whole register space */
 	np = of_find_matching_node(NULL, immr_ids);
-	mbar = of_iomap(np, 0);
+
+	if (of_address_to_resource(np, 0, &res)) {
+		pr_err("mpc52xx_pm_prepare(): could not get IMMR address\n");
+		of_node_put(np);
+		return -ENOSYS;
+	}
+
+	mbar = ioremap(res.start, 0xc000); /* we should map whole region including SRAM */
+
 	of_node_put(np);
 	if (!mbar) {
 		pr_err("mpc52xx_pm_prepare(): could not map registers\n");