9 files changed, 30 insertions, 37 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index b6f3ad5441c5..e98f3248c8aa 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -24,7 +24,6 @@ config BLACKFIN
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_IDE
-        select HAVE_IRQ_WORK
         select HAVE_KERNEL_GZIP if RAMKERNEL
         select HAVE_KERNEL_BZIP2 if RAMKERNEL
         select HAVE_KERNEL_LZMA if RAMKERNEL
@@ -38,7 +37,6 @@ config BLACKFIN
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_PROBE
-        select IRQ_PER_CPU if SMP
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
         select GENERIC_SMP_IDLE_THREAD
@@ -562,8 +560,7 @@ choice
           accurate - This option is therefore marked experimental.
 
 config BFIN_KERNEL_CLOCK_MEMINIT_CALC
-        bool "Calculate Timings (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "Calculate Timings"
 
 config BFIN_KERNEL_CLOCK_MEMINIT_SPEC
         bool "Provide accurate Timings based on target SCLK"
@@ -1120,7 +1117,7 @@ endchoice
 
 comment "Memory Protection Unit"
 config MPU
-        bool "Enable the memory protection unit (EXPERIMENTAL)"
+        bool "Enable the memory protection unit"
         default n
         help
           Use the processor's MPU to protect applications from accessing
@@ -1442,7 +1439,6 @@ config BFIN_CPU_FREQ
 
 config CPU_VOLTAGE
         bool "CPU Voltage scaling"
-        depends on EXPERIMENTAL
         depends on CPU_FREQ
         default n
         help
diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h
index bbf461076a0a..054d9ec57d9d 100644
--- a/arch/blackfin/include/asm/dma-mapping.h
+++ b/arch/blackfin/include/asm/dma-mapping.h
@@ -154,4 +154,14 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
         _dma_sync((dma_addr_t)vaddr, size, dir);
 }
 
+/* drivers/base/dma-mapping.c */
+extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
+                           void *cpu_addr, dma_addr_t dma_addr, size_t size);
+extern int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
+                                  void *cpu_addr, dma_addr_t dma_addr,
+                                  size_t size);
+
+#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)
+#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)
+
 #endif                          /* _BLACKFIN_DMA_MAPPING_H */
diff --git a/arch/blackfin/include/asm/mem_init.h b/arch/blackfin/include/asm/mem_init.h
index f019e9bcefe9..9b33e7247864 100644
--- a/arch/blackfin/include/asm/mem_init.h
+++ b/arch/blackfin/include/asm/mem_init.h
@@ -411,7 +411,7 @@ static struct ddr_config ddr_config_table[] __attribute__((section(".data_l1")))
                 .dmc_ddrcfg = 0x00000422,
                 .dmc_ddrtr0 = 0x20E0A424,
                 .dmc_ddrtr1 = 0x3020079E,
-                .dmc_ddrtr2 = 0x0032020D,
+                .dmc_ddrtr2 = 0x0032050D,
                 .dmc_ddrmr  = 0x00000842,
                 .dmc_ddrmr1 = 0x4,
         },
diff --git a/arch/blackfin/include/asm/uaccess.h b/arch/blackfin/include/asm/uaccess.h
index 461bb542e2e8..57701c3b8a59 100644
--- a/arch/blackfin/include/asm/uaccess.h
+++ b/arch/blackfin/include/asm/uaccess.h
@@ -191,6 +191,7 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
                 memcpy((void __force *)to, from, n);
         else
                 return n;
+        SSYNC();
         return 0;
 }
 
diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c
index e7be6532d6a0..df437e52d9df 100644
--- a/arch/blackfin/kernel/dma-mapping.c
+++ b/arch/blackfin/kernel/dma-mapping.c
@@ -13,6 +13,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/export.h>
+#include <linux/bitmap.h>
 
 static spinlock_t dma_page_lock;
 static unsigned long *dma_page;
@@ -46,24 +47,17 @@ static inline unsigned int get_pages(size_t size)
 static unsigned long __alloc_dma_pages(unsigned int pages)
 {
         unsigned long ret = 0, flags;
-        int i, count = 0;
+        unsigned long start;
 
         if (dma_initialized == 0)
                 dma_alloc_init(_ramend - DMA_UNCACHED_REGION, _ramend);
 
         spin_lock_irqsave(&dma_page_lock, flags);
 
-        for (i = 0; i < dma_pages;) {
-                if (test_bit(i++, dma_page) == 0) {
-                        if (++count == pages) {
-                                while (count--)
-                                        __set_bit(--i, dma_page);
-
-                                ret = dma_base + (i << PAGE_SHIFT);
-                                break;
-                        }
-                } else
-                        count = 0;
+        start = bitmap_find_next_zero_area(dma_page, dma_pages, 0, pages, 0);
+        if (start < dma_pages) {
+                ret = dma_base + (start << PAGE_SHIFT);
+                bitmap_set(dma_page, start, pages);
         }
         spin_unlock_irqrestore(&dma_page_lock, flags);
         return ret;
@@ -73,7 +67,6 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages)
 {
         unsigned long page = (addr - dma_base) >> PAGE_SHIFT;
         unsigned long flags;
-        int i;
 
         if ((page + pages) > dma_pages) {
                 printk(KERN_ERR "%s: freeing outside range.\n", __func__);
@@ -81,9 +74,7 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages)
         }
 
         spin_lock_irqsave(&dma_page_lock, flags);
-        for (i = page; i < page + pages; i++)
-                __clear_bit(i, dma_page);
-
+        bitmap_clear(dma_page, page, pages);
         spin_unlock_irqrestore(&dma_page_lock, flags);
 }
 
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 3e16ad9b0a99..8061426b7df5 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -39,12 +39,6 @@ int nr_l1stack_tasks;
 void *l1_stack_base;
 unsigned long l1_stack_len;
 
-/*
- * Powermanagement idle function, if any..
- */
-void (*pm_idle)(void) = NULL;
-EXPORT_SYMBOL(pm_idle);
-
 void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
 
@@ -81,7 +75,6 @@ void cpu_idle(void)
 {
         /* endless idle loop with no priority at all */
         while (1) {
-                void (*idle)(void) = pm_idle;
 
 #ifdef CONFIG_HOTPLUG_CPU
                 if (cpu_is_offline(smp_processor_id()))
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
index f608f02f29a3..cb0a4845339e 100644
--- a/arch/blackfin/kernel/time-ts.c
+++ b/arch/blackfin/kernel/time-ts.c
@@ -329,12 +329,6 @@ void bfin_coretmr_clockevent_init(void)
         evt->broadcast = smp_timer_broadcast;
 #endif
 
-
-#ifdef CONFIG_SMP
-        evt->broadcast = smp_timer_broadcast;
-#endif
-
-
         evt->name = "bfin_core_timer";
         evt->rating = 350;
         evt->irq = -1;
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c
index 2310b249675f..3126b920a4a5 100644
--- a/arch/blackfin/kernel/time.c
+++ b/arch/blackfin/kernel/time.c
@@ -85,7 +85,7 @@ time_sched_init(irqreturn_t(*timer_routine) (int, void *))
 /*
  * Should return useconds since last timer tick
  */
-u32 arch_gettimeoffset(void)
+static u32 blackfin_gettimeoffset(void)
 {
         unsigned long offset;
         unsigned long clocks_per_jiffy;
@@ -141,6 +141,10 @@ void read_persistent_clock(struct timespec *ts)
 
 void __init time_init(void)
 {
+#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
+        arch_gettimeoffset = blackfin_gettimeoffset;
+#endif
+
 #ifdef CONFIG_RTC_DRV_BFIN
         /* [#2663] hack to filter junk RTC values that would cause
          * userspace to have to deal with time values greater than
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 83ff311fd6ea..6c0c6816a51a 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1195,6 +1195,7 @@ static struct syscore_ops sec_pm_syscore_ops = {
         .suspend = sec_suspend,
         .resume = sec_resume,
 };
+
 #endif
 #else
 # define bfin_gpio_set_wake NULL
@@ -1596,7 +1597,10 @@ int __init init_arch_irq(void)
         bfin_write_SEC_SCI(1, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN);
 
         init_software_driven_irq();
+
+#ifdef CONFIG_PM
         register_syscore_ops(&sec_pm_syscore_ops);
+#endif
 
         return 0;
 }