Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[oweals/u-boot.git] / include / asm-ppc / immap_qe.h

diff --git a/include/asm-ppc/immap_qe.h b/include/asm-ppc/immap_qe.h
index 66a4735dda2d06fa1af508c862d4d2de83e9b1ee..531cfc891d74e13e8b147c7e69ff3f41681b3b89 100644 (file)
--- a/include/asm-ppc/immap_qe.h
+++ b/include/asm-ppc/immap_qe.h
@@ -3,7 +3,7 @@
  * The Internal Memory Map for devices with QE on them. This
  * is the superset of all QE devices (8360, etc.).
  *
- * Copyright (c) 2006 Freescale Semiconductor, Inc.
+ * Copyright (c) 2006-2009 Freescale Semiconductor, Inc.
  * Author: Shlomi Gridih <gridish@freescale.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
@@ -582,9 +582,12 @@ typedef struct qe_immap {
        u8 res14[0x300];
        u8 res15[0x3A00];
        u8 res16[0x8000];       /* 0x108000 -  0x110000 */
-#if defined(CONFIG_MPC8568)||defined(CONFIG_MPC8569)
+#if defined(CONFIG_MPC8568)
        u8 muram[0x10000];      /* 0x1_0000 -  0x2_0000 Multi-user RAM */
        u8 res17[0x20000];      /* 0x2_0000 -  0x4_0000 */
+#elif defined(CONFIG_MPC8569)
+       u8 muram[0x20000];      /* 0x1_0000 -  0x3_0000 Multi-user RAM */
+       u8 res17[0x10000];      /* 0x3_0000 -  0x4_0000 */
 #else
        u8 muram[0xC000];       /* 0x110000 -  0x11C000 Multi-user RAM */
        u8 res17[0x24000];      /* 0x11C000 -  0x140000 */
@@ -594,12 +597,25 @@ typedef struct qe_immap {
 
 extern qe_map_t *qe_immr;
 
-#if defined(CONFIG_MPC8568) || defined(CONFIG_MPC8569)
+#if defined(CONFIG_MPC8568)
 #define QE_MURAM_SIZE          0x10000UL
+#elif defined(CONFIG_MPC8569)
+#define QE_MURAM_SIZE          0x20000UL
 #elif defined(CONFIG_MPC8360)
 #define QE_MURAM_SIZE          0xc000UL
-#elif defined(CONFIG_MPC832X)
+#elif defined(CONFIG_MPC832x)
 #define QE_MURAM_SIZE          0x4000UL
 #endif
 
+#if defined(CONFIG_MPC8323)
+#define MAX_QE_RISC     1
+#define QE_NUM_OF_SNUM 28
+#elif defined(CONFIG_MPC8569)
+#define MAX_QE_RISC     4
+#define QE_NUM_OF_SNUM 46
+#else
+#define MAX_QE_RISC    2
+#define QE_NUM_OF_SNUM 28
+#endif
+
 #endif                         /* __IMMAP_QE_H__ */