Merge tag 'for-linus' of git://github.com/realmz/blackfin-linux

Pull blackfin updates from Steven Miao.

* tag 'for-linus' of git://github.com/realmz/blackfin-linux:
  bfin cache: dcplb map: add 16M dcplb map for BF60x
  blackfin: smp: fix smp build after drop asm/system.h
  blackfin: fix bootup core clock and system clock display
  Platform Nand: Set the GPIO for NAND read as input
  blackfin: rename vmImage to uImage after we move to buildroot
  blackfin: twi: Remove bogus #endif
  bf609: rsi: Add bf609 rsi MMR macro and board platform data.
  blackfin: dmc: Improve DDR2 write through in DMC effict controller.

diff --combined arch/blackfin/kernel/cplbinfo.c
index 404045dcc5e4bc321c30ddf0eecc1a259e5312ce,49b28ed29737e0f4fd137532740e87b7054f24b2..5b80d59e66e57b11a3592378abc6914adc938f28
--- 1/arch/blackfin/kernel/cplbinfo.c
--- 2/arch/blackfin/kernel/cplbinfo.c
+++ b/arch/blackfin/kernel/cplbinfo.c
@@@ -17,8 -17,13 +17,13 @@@
  #include <asm/cplbinit.h>
  #include <asm/blackfin.h>
  
- static char const page_strtbl[][3] = { "1K", "4K", "1M", "4M" };
- #define page(flags)    (((flags) & 0x30000) >> 16)
+ static char const page_strtbl[][4] = {
+       "1K", "4K", "1M", "4M",
+ #ifdef CONFIG_BF60x
+       "16K", "64K", "16M", "64M",
+ #endif
+ };
+ #define page(flags)    (((flags) & 0x70000) >> 16)
  #define strpage(flags) page_strtbl[page(flags)]
  
  struct cplbinfo_data {
@@@ -116,12 -121,14 +121,12 @@@ static const struct seq_operations cplb
  
  static int cplbinfo_open(struct inode *inode, struct file *file)
  {
 -      struct proc_dir_entry *pde = PDE(file_inode(file));
        char cplb_type;
 -      unsigned int cpu;
 +      unsigned int cpu = (unsigned long)PDE_DATA(file_inode(file));
        int ret;
        struct seq_file *m;
        struct cplbinfo_data *cdata;
  
 -      cpu = (unsigned int)pde->data;
        cplb_type = cpu & CPLBINFO_DCPLB_FLAG ? 'D' : 'I';
        cpu &= ~CPLBINFO_DCPLB_FLAG;