Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile

1 files changed, 10 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index a55b0b6813e..76722532bd9 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/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");