Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / include / asm-powerpc / fs_pd.h

diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h
index d530f68..c624915 100644 (file)
--- a/include/asm-powerpc/fs_pd.h
+++ b/include/asm-powerpc/fs_pd.h
@@ -14,6 +14,55 @@
 #include <sysdev/fsl_soc.h>
 #include <asm/time.h>
 
+#ifdef CONFIG_CPM2
+#include <asm/cpm2.h>
+
+#if defined(CONFIG_8260)
+#include <asm/mpc8260.h>
+#elif defined(CONFIG_85xx)
+#include <asm/mpc85xx.h>
+#endif
+
+#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
+
+#ifdef CONFIG_8xx
+#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;                                                           \
+})
+
+#define immr_unmap(addr)               iounmap(addr)
+#endif
+
 static inline int uart_baudrate(void)
 {
         return get_baudrate();