4 files changed, 42 insertions, 10 deletions

diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index fd5448d6107c..d54f19085f37 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -90,6 +90,17 @@ int request_dma(unsigned int channel, char *device_id)
 {
 
         pr_debug("request_dma() : BEGIN \n");
+
+#if defined(CONFIG_BF561) && ANOMALY_05000182
+        if (channel >= CH_IMEM_STREAM0_DEST && channel <= CH_IMEM_STREAM1_DEST) {
+                if (get_cclk() > 500000000) {
+                        printk(KERN_WARNING
+                               "Request IMDMA failed due to ANOMALY 05000182\n");
+                        return -EFAULT;
+                }
+        }
+#endif
+
         mutex_lock(&(dma_ch[channel].dmalock));
 
         if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED)
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 7e8eaf4a31bb..b6d89d1644cc 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -1130,6 +1130,25 @@ void bfin_gpio_irq_prepare(unsigned gpio)
 
 #else
 
+int gpio_get_value(unsigned gpio)
+{
+        unsigned long flags;
+        int ret;
+
+        if (unlikely(get_gpio_edge(gpio))) {
+                local_irq_save(flags);
+                set_gpio_edge(gpio, 0);
+                ret = get_gpio_data(gpio);
+                set_gpio_edge(gpio, 1);
+                local_irq_restore(flags);
+
+                return ret;
+        } else
+                return get_gpio_data(gpio);
+}
+EXPORT_SYMBOL(gpio_get_value);
+
+
 int gpio_direction_input(unsigned gpio)
 {
         unsigned long flags;
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c
index 053edff6c0d8..4367330909b2 100644
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
@@ -90,7 +90,9 @@ EXPORT_SYMBOL(__umodsi3);
 EXPORT_SYMBOL(outsb);
 EXPORT_SYMBOL(insb);
 EXPORT_SYMBOL(outsw);
+EXPORT_SYMBOL(outsw_8);
 EXPORT_SYMBOL(insw);
+EXPORT_SYMBOL(insw_8);
 EXPORT_SYMBOL(outsl);
 EXPORT_SYMBOL(insl);
 EXPORT_SYMBOL(insl_16);
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 5b847070dae5..7bfbd958980c 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -364,13 +364,13 @@ asmlinkage void trap_c(struct pt_regs *fp)
         /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */
         case VEC_CPLB_MHIT:
                 info.si_code = ILL_CPLB_MULHIT;
-#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
                 sig = SIGSEGV;
-                printk(KERN_NOTICE "NULL pointer access (probably)\n");
-#else
-                sig = SIGILL;
-                printk(KERN_NOTICE EXC_0x27(KERN_NOTICE));
+#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
+                if (saved_dcplb_fault_addr < (void *)FIXED_CODE_START)
+                        printk(KERN_NOTICE "NULL pointer access\n");
+                else
 #endif
+                        printk(KERN_NOTICE EXC_0x27(KERN_NOTICE));
                 CHK_DEBUGGER_TRAP();
                 break;
         /* 0x28 - Emulation Watchpoint, handled here */
@@ -419,13 +419,13 @@ asmlinkage void trap_c(struct pt_regs *fp)
         /* 0x2D - Instruction CPLB Multiple Hits, handled here */
         case VEC_CPLB_I_MHIT:
                 info.si_code = ILL_CPLB_MULHIT;
-#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
                 sig = SIGSEGV;
-                printk(KERN_NOTICE "Jump to address 0 - 0x0fff\n");
-#else
-                sig = SIGILL;
-                printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE));
+#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
+                if (saved_icplb_fault_addr < (void *)FIXED_CODE_START)
+                        printk(KERN_NOTICE "Jump to NULL address\n");
+                else
 #endif
+                        printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE));
                 CHK_DEBUGGER_TRAP();
                 break;
         /* 0x2E - Illegal use of Supervisor Resource, handled here */