3 files changed, 26 insertions, 0 deletions

diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h
index d530f68b4eef..3d0e819d37f1 100644
--- a/include/asm-powerpc/fs_pd.h
+++ b/include/asm-powerpc/fs_pd.h
@@ -11,6 +11,7 @@
 
 #ifndef FS_PD_H
 #define FS_PD_H
+#include <asm/cpm2.h>
 #include <sysdev/fsl_soc.h>
 #include <asm/time.h>
 
@@ -24,4 +25,21 @@ static inline int uart_clock(void)
         return ppc_proc_freq;
 }
 
+#define cpm2_map(member)                                                \
+({                                                                      \
+        u32 offset = offsetof(cpm2_map_t, member);                      \
+        void *addr = ioremap (CPM_MAP_ADDR + offset,                    \
+                              sizeof( ((cpm2_map_t*)0)->member));       \
+        addr;                                                           \
+})
+
+#define cpm2_map_size(member, size)                                     \
+({                                                                      \
+        u32 offset = offsetof(cpm2_map_t, member);                      \
+        void *addr = ioremap (CPM_MAP_ADDR + offset, size);             \
+        addr;                                                           \
+})
+
+#define cpm2_unmap(addr)        iounmap(addr)
+
 #endif
diff --git a/include/asm-ppc/cpm2.h b/include/asm-ppc/cpm2.h
index 876974e5412f..bd6623aed383 100644
--- a/include/asm-ppc/cpm2.h
+++ b/include/asm-ppc/cpm2.h
@@ -177,6 +177,10 @@ typedef struct cpm_buf_desc {
 #define PROFF_I2C_BASE          ((uint)0x8afc)
 #define PROFF_IDMA4_BASE        ((uint)0x8afe)
 
+#define PROFF_SCC_SIZE          ((uint)0x100)
+#define PROFF_FCC_SIZE          ((uint)0x100)
+#define PROFF_SMC_SIZE          ((uint)64)
+
 /* The SMCs are relocated to any of the first eight DPRAM pages.
  * We will fix these at the first locations of DPRAM, until we
  * get some microcode patches :-).
diff --git a/include/asm-ppc/fs_pd.h b/include/asm-ppc/fs_pd.h
index eed777834121..8691327653af 100644
--- a/include/asm-ppc/fs_pd.h
+++ b/include/asm-ppc/fs_pd.h
@@ -29,4 +29,8 @@ static inline int uart_clock(void)
         return (((bd_t *) __res)->bi_intfreq);
 }
 
+#define cpm2_map(member)        (&cpm2_immr->member)
+#define cpm2_map_size(member, size)     (&cpm2_immr->member)
+#define cpm2_unmap(addr)        do {} while(0)
+
 #endif