2 files changed, 7 insertions, 16 deletions

diff --git a/include/asm-powerpc/commproc.h b/include/asm-powerpc/commproc.h
index 397248705e0e..86fcf265c54a 100644
--- a/include/asm-powerpc/commproc.h
+++ b/include/asm-powerpc/commproc.h
@@ -66,7 +66,7 @@
 /* Export the base address of the communication processor registers
  * and dual port ram.
  */
-extern  cpm8xx_t        *cpmp;          /* Pointer to comm processor */
+extern cpm8xx_t __iomem *cpmp; /* Pointer to comm processor */
 extern unsigned long cpm_dpalloc(uint size, uint align);
 extern int cpm_dpfree(unsigned long offset);
 extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
@@ -689,4 +689,6 @@ typedef struct risc_timer_pram {
 extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
 extern void cpm_free_handler(int vec);
 
+#define IMAP_ADDR               (get_immrbase())
+
 #endif /* __CPM_8XX__ */
diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h
index c624915b757e..77e04d01749c 100644
--- a/include/asm-powerpc/fs_pd.h
+++ b/include/asm-powerpc/fs_pd.h
@@ -45,22 +45,11 @@
 #include <asm/8xx_immap.h>
 #include <asm/mpc8xx.h>
 
-#define immr_map(member)                                                \
-({                                                                      \
-        u32 offset = offsetof(immap_t, member);                         \
-        void *addr = ioremap (IMAP_ADDR + offset,                       \
-                              sizeof( ((immap_t*)0)->member));          \
-        addr;                                                           \
-})
-
-#define immr_map_size(member, size)                                     \
-({                                                                      \
-        u32 offset = offsetof(immap_t, member);                         \
-        void *addr = ioremap (IMAP_ADDR + offset, size);                \
-        addr;                                                           \
-})
+extern immap_t __iomem *mpc8xx_immr;
 
-#define immr_unmap(addr)                iounmap(addr)
+#define immr_map(member) (&mpc8xx_immr->member)
+#define immr_map_size(member, size) (&mpc8xx_immr->member)
+#define immr_unmap(addr) do {} while (0)
 #endif
 
 static inline int uart_baudrate(void)