From 2b4270623e1d1c4e94eaf98ce543e36eb57b8ba1 Mon Sep 17 00:00:00 2001
From: "Kokoris, Ioannis" <ioannis.kokoris@siemens-enterprise.com>
Date: Fri, 11 Nov 2011 17:05:11 +0100
Subject: [PATCH] --- yaml --- r: 313715 b: refs/heads/master c:
 e65650e6c3eb67226eda80a21f62b7aa145878f4 h: refs/heads/master i:   313713:
 a33fa9c56d7651d5da47bf1883093f296c392d9a   313711:
 74b962979a1586cf463f2fdb8e1474976a3ee9a9 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/include/asm/immap_qe.h | 4 +++-
 trunk/arch/powerpc/include/asm/qe.h       | 1 +
 trunk/arch/powerpc/sysdev/qe_lib/qe.c     | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 93546cf960b9..28ebe4d3fc9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f0e90ad7a3b6f9f8a0598ed30f4e9c7dd9ff82e
+refs/heads/master: e65650e6c3eb67226eda80a21f62b7aa145878f4
diff --git a/trunk/arch/powerpc/include/asm/immap_qe.h b/trunk/arch/powerpc/include/asm/immap_qe.h
index 0edb6842b13d..61e8490786b8 100644
--- a/trunk/arch/powerpc/include/asm/immap_qe.h
+++ b/trunk/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/trunk/arch/powerpc/include/asm/qe.h b/trunk/arch/powerpc/include/asm/qe.h
index 5e0b6d511e14..229571a49391 100644
--- a/trunk/arch/powerpc/include/asm/qe.h
+++ b/trunk/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 */
diff --git a/trunk/arch/powerpc/sysdev/qe_lib/qe.c b/trunk/arch/powerpc/sysdev/qe_lib/qe.c
index 818e763f8265..b04367529729 100644
--- a/trunk/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/trunk/arch/powerpc/sysdev/qe_lib/qe.c
@@ -395,6 +395,9 @@ static void qe_upload_microcode(const void *base,
 
 	for (i = 0; i < be32_to_cpu(ucode->count); i++)
 		out_be32(&qe_immr->iram.idata, be32_to_cpu(code[i]));
+	
+	/* Set I-RAM Ready Register */
+	out_be32(&qe_immr->iram.iready, be32_to_cpu(QE_IRAM_READY));
 }
 
 /*