1 files changed, 10 insertions, 20 deletions

diff --git a/include/asm-powerpc/immap_qe.h b/include/asm-powerpc/immap_qe.h
index 02548f74ccb7..aba9806b31c9 100644
--- a/include/asm-powerpc/immap_qe.h
+++ b/include/asm-powerpc/immap_qe.h
@@ -97,10 +97,7 @@ struct qe_mux {
         __be32  cmxsi1cr_l;     /* CMX SI1 clock route low register */
         __be32  cmxsi1cr_h;     /* CMX SI1 clock route high register */
         __be32  cmxsi1syr;      /* CMX SI1 SYNC route register */
-        __be32  cmxucr1;        /* CMX UCC1, UCC3 clock route register */
-        __be32  cmxucr2;        /* CMX UCC5, UCC7 clock route register */
-        __be32  cmxucr3;        /* CMX UCC2, UCC4 clock route register */
-        __be32  cmxucr4;        /* CMX UCC6, UCC8 clock route register */
+        __be32  cmxucr[4];      /* CMX UCCx clock route registers */
         __be32  cmxupcr;        /* CMX UPC clock route register */
         u8      res0[0x1C];
 } __attribute__ ((packed));
@@ -261,7 +258,6 @@ struct ucc_slow {
         __be16  utpt;
         u8      res4[0x52];
         u8      guemr;          /* UCC general extended mode register */
-        u8      res5[0x200 - 0x091];
 } __attribute__ ((packed));
 
 /* QE UCC Fast */
@@ -294,21 +290,13 @@ struct ucc_fast {
         __be32  urtry;          /* UCC retry counter register */
         u8      res8[0x4C];
         u8      guemr;          /* UCC general extended mode register */
-        u8      res9[0x100 - 0x091];
-} __attribute__ ((packed));
-
-/* QE UCC */
-struct ucc_common {
-        u8      res1[0x90];
-        u8      guemr;
-        u8      res2[0x200 - 0x091];
 } __attribute__ ((packed));
 
 struct ucc {
         union {
                 struct  ucc_slow slow;
                 struct  ucc_fast fast;
-                struct  ucc_common common;
+                u8      res[0x200];     /* UCC blocks are 512 bytes each */
         };
 } __attribute__ ((packed));
 
@@ -407,7 +395,7 @@ struct dbg {
 
 /* RISC Special Registers (Trap and Breakpoint) */
 struct rsp {
-        u8      fixme[0x100];
+        u32     reg[0x40];      /* 64 32-bit registers */
 } __attribute__ ((packed));
 
 struct qe_immap {
@@ -436,11 +424,13 @@ struct qe_immap {
         u8                      res13[0x600];
         struct upc              upc2;           /* MultiPHY UTOPIA POS Ctrlr 2*/
         struct sdma             sdma;           /* SDMA */
-        struct dbg              dbg;            /* Debug Space */
-        struct rsp              rsp[0x2];       /* RISC Special Registers
+        struct dbg              dbg;            /* 0x104080 - 0x1040FF
+                                                   Debug Space */
+        struct rsp              rsp[0x2];       /* 0x104100 - 0x1042FF
+                                                   RISC Special Registers
                                                    (Trap and Breakpoint) */
-        u8                      res14[0x300];
-        u8                      res15[0x3A00];
+        u8                      res14[0x300];   /* 0x104300 - 0x1045FF */
+        u8                      res15[0x3A00];  /* 0x104600 - 0x107FFF */
         u8                      res16[0x8000];  /* 0x108000 - 0x110000 */
         u8                      muram[0xC000];  /* 0x110000 - 0x11C000
                                                    Multi-user RAM */
@@ -451,7 +441,7 @@ struct qe_immap {
 extern struct qe_immap *qe_immr;
 extern phys_addr_t get_qe_base(void);
 
-static inline unsigned long immrbar_virt_to_phys(volatile void * address)
+static inline unsigned long immrbar_virt_to_phys(void *address)
 {
         if ( ((u32)address >= (u32)qe_immr) &&
                         ((u32)address < ((u32)qe_immr + QE_IMMAP_SIZE)) )