Merge tag 'soc-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-2.6-block.git] / arch / arm / mach-orion5x / board-dt.c

diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c
index 35a8014529ca7b45b68a769a59e8a8d11d3e0782..b91002ca92f3b42b6a04f54683daa4f2504e5c2a 100644 (file)
--- a/arch/arm/mach-orion5x/board-dt.c
+++ b/arch/arm/mach-orion5x/board-dt.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/cpu.h>
 #include <asm/system_misc.h>
 #include <asm/mach/arch.h>
 #include <mach/orion5x.h>
@@ -41,7 +42,7 @@ static void __init orion5x_dt_init(void)
        /*
         * Setup Orion address map
         */
-       orion5x_setup_cpu_mbus_bridge();
+       orion5x_setup_wins();
 
        /* Setup root of clk tree */
        clk_init();
@@ -52,7 +53,7 @@ static void __init orion5x_dt_init(void)
         */
        if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) {
                printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
-               disable_hlt();
+               cpu_idle_poll_ctrl(true);
        }
 
        if (of_machine_is_compatible("lacie,ethernet-disk-mini-v2"))