Blackfin arch: fix bug - reboot fails on BF527

add ANOMALY_05000435 to handle SIC_IWR1 workaround for rebooting

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 5a7c1c177d23df3b9afcbec54ab42d1fcca82a88..f7e35e7965fc5733ca1e4de0291e1901917892e5 100644 (file)
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1069,7 +1069,10 @@ int __init init_arch_irq(void)
         * up from IDLE instructions.  See this report for more info:
         * http://blackfin.uclinux.org/gf/tracker/4323
         */
-       bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11));
+       if (ANOMALY_05000435)
+               bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11));
+       else
+               bfin_write_SIC_IWR1(IWR_DISABLE_ALL);
 #else
        bfin_write_SIC_IWR1(IWR_DISABLE_ALL);
 #endif

diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index ee33a8a988bde070fbbf6e07f554766c52385bfd..96600b8cb6ad134d7c9441865303418bcc504702 100644 (file)
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -91,7 +91,10 @@ void bfin_pm_suspend_standby_enter(void)
         * up from IDLE instructions.  See this report for more info:
         * http://blackfin.uclinux.org/gf/tracker/4323
         */
-       bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11));
+       if (ANOMALY_05000435)
+               bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11));
+       else
+               bfin_write_SIC_IWR1(IWR_DISABLE_ALL);
 #else
        bfin_write_SIC_IWR1(IWR_DISABLE_ALL);
 #endif