Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (47 commits)
  Blackfin: bfin_spi.h: add MMR peripheral layout
  Blackfin: bfin_ppi.h: start a common PPI/EPPI header
  Blackfin: bfin_can.h: add missing VERSION/VERSION2 MMRs
  Blackfin: bf538: add missing SIC_RVECT define
  Blackfin: bf561: rewrite SICA_xxx to just SIC_xxx
  Blackfin: bf54x: add missing SIC_RVECT definition
  Blackfin: H8606: move 8250 irqflags to platform resources
  Blackfin: glue XIP/ROM kernel kconfigs
  Blackfin: update sparse flags for latest upstream changes
  Blackfin: coreb: update ioctl numbers
  Blackfin: coreb: add gpl module license
  Blackfin: bf518-ezkit: add ssm2603 codec resources
  Blackfin: bf51x/bf52x: fix 16/32bit SPORT MMR helpers
  Blackfin: tll6527m: new board port
  Blackfin: bf526-ezbrd/bf527-ezkit: add NAND partition for u-boot
  Blackfin: merge kernel init memory back into main memory region
  Blackfin: gpio: add peripheral group check
  Blackfin: dma: bf54x: add missing break for SPORT1 TX IRQ
  Blackfin: add new cacheflush syscall
  Blackfin: bf548-ezkit: increase u-boot partition size
  ...

diff --combined arch/blackfin/mach-bf561/coreb.c
index c6a4c8f,6197902..78ecb50
--- 1/arch/blackfin/mach-bf561/coreb.c
--- 2/arch/blackfin/mach-bf561/coreb.c
+++ b/arch/blackfin/mach-bf561/coreb.c
@@@ -18,9 -18,9 +18,9 @@@
  #include <linux/miscdevice.h>
  #include <linux/module.h>
  
- #define CMD_COREB_START               2
- #define CMD_COREB_STOP                3
- #define CMD_COREB_RESET               4
+ #define CMD_COREB_START               _IO('b', 0)
+ #define CMD_COREB_STOP                _IO('b', 1)
+ #define CMD_COREB_RESET               _IO('b', 2)
  
  static long
  coreb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
@@@ -29,10 -29,10 +29,10 @@@
  
        switch (cmd) {
        case CMD_COREB_START:
-               bfin_write_SICA_SYSCR(bfin_read_SICA_SYSCR() & ~0x0020);
+               bfin_write_SYSCR(bfin_read_SYSCR() & ~0x0020);
                break;
        case CMD_COREB_STOP:
-               bfin_write_SICA_SYSCR(bfin_read_SICA_SYSCR() | 0x0020);
+               bfin_write_SYSCR(bfin_read_SYSCR() | 0x0020);
                bfin_write_SICB_SYSCR(bfin_read_SICB_SYSCR() | 0x0080);
                break;
        case CMD_COREB_RESET:
@@@ -51,7 -51,6 +51,7 @@@
  static const struct file_operations coreb_fops = {
        .owner          = THIS_MODULE,
        .unlocked_ioctl = coreb_ioctl,
 +      .llseek         = noop_llseek,
  };
  
  static struct miscdevice coreb_dev = {
@@@ -74,3 -73,4 +74,4 @@@ module_exit(bf561_coreb_exit)
  
  MODULE_AUTHOR("Bas Vermeulen <bvermeul@blackstar.xs4all.nl>");
  MODULE_DESCRIPTION("BF561 Core B Support");
+ MODULE_LICENSE("GPL");