[U-Boot] unassigned-patches/22: [PATCH] Removed hardcoded MxMR loop value from upmconfig() for MPC85xx.

[u-boot]

Signed-off-by: Sergei Poselenov <[EMAIL PROTECTED]>

---
Added to GNATS database as unassigned-patches/22
>Responsible:    patch-coord
>Message-Id:     <[EMAIL PROTECTED]>
>In-Reply-To:    <[EMAIL PROTECTED]>
>References:     <[EMAIL PROTECTED]> <[EMAIL PROTECTED]> <[EMAIL PROTECTED]>
>Patch-Date:     Fri Aug 15 15:42:11 +0200 2008
---
 cpu/mpc85xx/cpu.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index bde8e56..eb041bb 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -288,16 +288,16 @@ int dma_xfer(void *dest, uint count, void *src) {
        return dma_check();
 }
 #endif
+
 /*
- * Configures a UPM. Currently, the loop fields in MxMR (RLF, WLF and TLF)
- * are hardcoded as "1"."size" is the number or entries, not a sizeof.
+ * Configures a UPM. The function requires the respective MxMR to be set
+ * before calling this function. "size" is the number or entries, not a sizeof.
  */
 void upmconfig (uint upm, uint * table, uint size)
 {
        int i, mdr, mad, old_mad = 0;
        volatile u32 *mxmr;
        volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR);
-       int loopval = 0x00004440;
        volatile u32 *brp,*orp;
        volatile u8* dummy = NULL;
        int upmmask;
@@ -325,8 +325,8 @@ void upmconfig (uint upm, uint * table, uint size)
                 i++, brp += 2, orp += 2) {
 
                /* Look for a valid BR with selected UPM */
-               if ((in_be32(brp) & (BR_V | upmmask)) == (BR_V | upmmask)) {
-                       dummy = (volatile u8*)(in_be32(brp) >> BR_BA_SHIFT);
+               if ((in_be32(brp) & (BR_V | BR_MSEL)) == (BR_V | upmmask)) {
+                       dummy = (volatile u8*)(in_be32(brp) & BR_BA);
                        break;
                }
        }
@@ -338,7 +338,7 @@ void upmconfig (uint upm, uint * table, uint size)
 
        for (i = 0; i < size; i++) {
                /* 1 */
-               out_be32(mxmr, loopval | 0x10000000 | i); /* OP_WRITE */
+               out_be32(mxmr,  (in_be32(mxmr) & 0x4fffffc0) | MxMR_OP_WARR | 
i);
                /* 2 */
                out_be32(&lbc->mdr, table[i]);
                /* 3 */
@@ -347,11 +347,11 @@ void upmconfig (uint upm, uint * table, uint size)
                *(volatile u8 *)dummy = 0;
                /* 5 */
                do {
-                       mad = in_be32(mxmr) & 0x3f;
+                       mad = in_be32(mxmr) & MxMR_MAD_MSK;
                } while (mad <= old_mad && !(!mad && i == (size-1)));
                old_mad = mad;
        }
-       out_be32(mxmr, loopval); /* OP_NORMAL */
+       out_be32(mxmr, (in_be32(mxmr) & 0x4fffffc0) | MxMR_OP_NORM);
 }
 
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIGMPC85XX_FEC)
-- 
1.5.6.1


_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot