Merge remote-tracking branch 'kumar/next' into next

Freescale updates for 3.6

2 files changed, 4 insertions, 1 deletions

diff --git a/arch/powerpc/include/asm/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h
index 0edb6842b13..61e8490786b 100644
--- a/arch/powerpc/include/asm/immap_qe.h
+++ b/arch/powerpc/include/asm/immap_qe.h
@@ -26,7 +26,9 @@
 struct qe_iram {
         __be32  iadd;           /* I-RAM Address Register */
         __be32  idata;          /* I-RAM Data Register */
-        u8      res0[0x78];
+        u8      res0[0x04];
+        __be32  iready;         /* I-RAM Ready Register */
+        u8      res1[0x70];
 } __attribute__ ((packed));
 
 /* QE Interrupt Controller */
diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h
index 5e0b6d511e1..229571a4939 100644
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
@@ -499,6 +499,7 @@ enum comm_dir {
 /* I-RAM */
 #define QE_IRAM_IADD_AIE        0x80000000      /* Auto Increment Enable */
 #define QE_IRAM_IADD_BADDR      0x00080000      /* Base Address */
+#define QE_IRAM_READY           0x80000000      /* Ready */
 
 /* UPC */
 #define UPGCR_PROTOCOL  0x80000000      /* protocol ul2 or pl2 */