1 files changed, 7 insertions, 45 deletions

diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S
index 4d5cfeacb123..051b05c88027 100644
--- a/arch/blackfin/mach-bf548/head.S
+++ b/arch/blackfin/mach-bf548/head.S
@@ -73,25 +73,19 @@ ENTRY(_start_dma_code)
         w[p0] = r0.l;
         ssync;
 
-#if defined(CONFIG_BF54x)
+        /* enable self refresh via SRREQ */
         P2.H = hi(EBIU_RSTCTL);
         P2.L = lo(EBIU_RSTCTL);
         R0 = [P2];
         BITSET (R0, 3);
-#else
-        P2.H = hi(EBIU_SDGCTL);
-        P2.L = lo(EBIU_SDGCTL);
-        R0 = [P2];
-        BITSET (R0, 24);
-#endif
         [P2] = R0;
         SSYNC;
-#if defined(CONFIG_BF54x)
+
+        /* wait for SRACK bit to be set */
 .LSRR_MODE:
         R0 = [P2];
         CC = BITTST(R0, 4);
         if !CC JUMP .LSRR_MODE;
-#endif
 
         r0 = CONFIG_VCO_MULT & 63;       /* Load the VCO multiplier         */
         r0 = r0 << 9;                    /* Shift it over,                  */
@@ -100,6 +94,9 @@ ENTRY(_start_dma_code)
         r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */
         r1 = r1 << 8;                    /* Shift it over                   */
         r0 = r1 | r0;                    /* add them all together           */
+#ifdef ANOMALY_05000265
+        r0 = BITSET(r0, 15);             /* Add 250 mV of hysteresis to SPORT input pins */
+#endif
 
         p0.h = hi(PLL_CTL);
         p0.l = lo(PLL_CTL);              /* Load the address                */
@@ -123,7 +120,7 @@ ENTRY(_start_dma_code)
         w[p0] = r0.l;
         ssync;
 
-#if defined(CONFIG_BF54x)
+        /* disable self refresh by clearing SRREQ */
         P2.H = hi(EBIU_RSTCTL);
         P2.L = lo(EBIU_RSTCTL);
         R0 = [P2];
@@ -155,41 +152,6 @@ ENTRY(_start_dma_code)
         r0.h = hi(mem_DDRCTL2);
         [p0] = r0;
         ssync;
-#else
-        p0.l = lo(EBIU_SDRRC);
-        p0.h = hi(EBIU_SDRRC);
-        r0 = mem_SDRRC;
-        w[p0] = r0.l;
-        ssync;
-
-        p0.l = LO(EBIU_SDBCTL);
-        p0.h = HI(EBIU_SDBCTL);     /* SDRAM Memory Bank Control Register */
-        r0 = mem_SDBCTL;
-        w[p0] = r0.l;
-        ssync;
-
-        P2.H = hi(EBIU_SDGCTL);
-        P2.L = lo(EBIU_SDGCTL);
-        R0 = [P2];
-        BITCLR (R0, 24);
-        p0.h = hi(EBIU_SDSTAT);
-        p0.l = lo(EBIU_SDSTAT);
-        r2.l = w[p0];
-        cc = bittst(r2,3);
-        if !cc jump .Lskip;
-        NOP;
-        BITSET (R0, 23);
-.Lskip:
-        [P2] = R0;
-        SSYNC;
-
-        R0.L = lo(mem_SDGCTL);
-        R0.H = hi(mem_SDGCTL);
-        R1 = [p2];
-        R1 = R1 | R0;
-        [P2] = R1;
-        SSYNC;
-#endif
 
         RTS;
 ENDPROC(_start_dma_code)