Merge branch 'ioat' into dmaengine

[mv-sheeva.git] / arch / blackfin / mach-common / clocks-init.c

diff --git a/arch/blackfin/mach-common/clocks-init.c b/arch/blackfin/mach-common/clocks-init.c
index 35393651359bfc004d996154fb7d8d2497e45b5b..d5cfe611b77834b9abfeaefd211d75b2a5f1c12a 100644 (file)
--- a/arch/blackfin/mach-common/clocks-init.c
+++ b/arch/blackfin/mach-common/clocks-init.c
@@ -13,6 +13,7 @@
 #include <asm/dma.h>
 #include <asm/clocks.h>
 #include <asm/mem_init.h>
+#include <asm/dpmc.h>
 
 #define SDGCTL_WIDTH (1 << 31) /* SDRAM external data path width */
 #define PLL_CTL_VAL \
@@ -72,6 +73,7 @@ void init_clocks(void)
 #endif
        bfin_write_PLL_LOCKCNT(0x300);
        do_sync();
+       /* We always write PLL_CTL thus avoiding Anomaly 05000242 */
        bfin_write16(PLL_CTL, PLL_CTL_VAL);
        __asm__ __volatile__("IDLE;");
        bfin_write_PLL_DIV(CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV);