diff options
| -rw-r--r-- | arch/blackfin/Kconfig | 1 | ||||
| -rw-r--r-- | arch/blackfin/Makefile | 26 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/.gitignore (renamed from include/asm-blackfin/.gitignore) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/Kbuild (renamed from include/asm-blackfin/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/a.out.h (renamed from include/asm-blackfin/a.out.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/atomic.h (renamed from include/asm-blackfin/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/auxvec.h (renamed from include/asm-blackfin/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/bfin-global.h (renamed from include/asm-blackfin/bfin-global.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/bfin5xx_spi.h (renamed from include/asm-blackfin/bfin5xx_spi.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/bfin_simple_timer.h (renamed from include/asm-blackfin/bfin_simple_timer.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/bfin_sport.h (renamed from include/asm-blackfin/bfin_sport.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/bitops.h (renamed from include/asm-blackfin/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/blackfin.h (renamed from include/asm-blackfin/blackfin.h) | 4 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/bug.h (renamed from include/asm-blackfin/bug.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/bugs.h (renamed from include/asm-blackfin/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/byteorder.h (renamed from include/asm-blackfin/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cache.h (renamed from include/asm-blackfin/cache.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cacheflush.h (renamed from include/asm-blackfin/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cdef_LPBlackfin.h (renamed from include/asm-blackfin/mach-common/cdef_LPBlackfin.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/checksum.h (renamed from include/asm-blackfin/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/clocks.h (renamed from include/asm-blackfin/mach-common/clocks.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/context.S (renamed from include/asm-blackfin/mach-common/context.S) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cplb-mpu.h (renamed from include/asm-blackfin/cplb-mpu.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cplb.h (renamed from include/asm-blackfin/cplb.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cplbinit.h (renamed from include/asm-blackfin/cplbinit.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cpumask.h (renamed from include/asm-blackfin/cpumask.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/cputime.h (renamed from include/asm-blackfin/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/current.h (renamed from include/asm-blackfin/current.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/def_LPBlackfin.h (renamed from include/asm-blackfin/mach-common/def_LPBlackfin.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/delay.h (renamed from include/asm-blackfin/delay.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/device.h (renamed from include/asm-blackfin/device.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/div64.h (renamed from include/asm-blackfin/div64.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/dma-mapping.h (renamed from include/asm-blackfin/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/dma.h (renamed from include/asm-blackfin/dma.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/dpmc.h (renamed from include/asm-blackfin/dpmc.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/early_printk.h (renamed from include/asm-blackfin/early_printk.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/elf.h (renamed from include/asm-blackfin/elf.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/emergency-restart.h (renamed from include/asm-blackfin/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/entry.h (renamed from include/asm-blackfin/entry.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/errno.h (renamed from include/asm-blackfin/errno.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/fb.h (renamed from include/asm-blackfin/fb.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/fcntl.h (renamed from include/asm-blackfin/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/fixed_code.h (renamed from include/asm-blackfin/fixed_code.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/flat.h (renamed from include/asm-blackfin/flat.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/futex.h (renamed from include/asm-blackfin/futex.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/gpio.h (renamed from include/asm-blackfin/gpio.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/gptimers.h (renamed from include/asm-blackfin/gptimers.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/hardirq.h (renamed from include/asm-blackfin/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/hw_irq.h (renamed from include/asm-blackfin/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/io.h (renamed from include/asm-blackfin/io.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/ioctl.h (renamed from include/asm-blackfin/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/ioctls.h (renamed from include/asm-blackfin/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/ipcbuf.h (renamed from include/asm-blackfin/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/irq.h (renamed from include/asm-blackfin/irq.h) | 4 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/irq_handler.h (renamed from include/asm-blackfin/irq_handler.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/irq_regs.h (renamed from include/asm-blackfin/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/kdebug.h (renamed from include/asm-blackfin/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/kgdb.h (renamed from include/asm-blackfin/kgdb.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/kmap_types.h (renamed from include/asm-blackfin/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/l1layout.h (renamed from include/asm-blackfin/l1layout.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/linkage.h (renamed from include/asm-blackfin/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/local.h (renamed from include/asm-blackfin/local.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/mem_map.h (renamed from include/asm-blackfin/mem_map.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/mman.h (renamed from include/asm-blackfin/mman.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/mmu.h (renamed from include/asm-blackfin/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/mmu_context.h (renamed from include/asm-blackfin/mmu_context.h) | 6 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/module.h (renamed from include/asm-blackfin/module.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/msgbuf.h (renamed from include/asm-blackfin/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/mutex.h (renamed from include/asm-blackfin/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/nand.h (renamed from include/asm-blackfin/nand.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/page.h (renamed from include/asm-blackfin/page.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/page_offset.h (renamed from include/asm-blackfin/page_offset.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/param.h (renamed from include/asm-blackfin/param.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/pci.h (renamed from include/asm-blackfin/pci.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/percpu.h (renamed from include/asm-blackfin/percpu.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/pgalloc.h (renamed from include/asm-blackfin/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/pgtable.h (renamed from include/asm-blackfin/pgtable.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/poll.h (renamed from include/asm-blackfin/poll.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/portmux.h (renamed from include/asm-blackfin/portmux.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/posix_types.h (renamed from include/asm-blackfin/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/processor.h (renamed from include/asm-blackfin/processor.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/ptrace.h (renamed from include/asm-blackfin/ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/reboot.h (renamed from include/asm-blackfin/reboot.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/resource.h (renamed from include/asm-blackfin/resource.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/scatterlist.h (renamed from include/asm-blackfin/scatterlist.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/sections.h (renamed from include/asm-blackfin/sections.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/segment.h (renamed from include/asm-blackfin/segment.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/sembuf.h (renamed from include/asm-blackfin/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/serial.h (renamed from include/asm-blackfin/serial.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/setup.h (renamed from include/asm-blackfin/setup.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/shmbuf.h (renamed from include/asm-blackfin/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/shmparam.h (renamed from include/asm-blackfin/shmparam.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/sigcontext.h (renamed from include/asm-blackfin/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/siginfo.h (renamed from include/asm-blackfin/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/signal.h (renamed from include/asm-blackfin/signal.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/socket.h (renamed from include/asm-blackfin/socket.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/sockios.h (renamed from include/asm-blackfin/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/spinlock.h (renamed from include/asm-blackfin/spinlock.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/stat.h (renamed from include/asm-blackfin/stat.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/statfs.h (renamed from include/asm-blackfin/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/string.h (renamed from include/asm-blackfin/string.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/system.h (renamed from include/asm-blackfin/system.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/termbits.h (renamed from include/asm-blackfin/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/termios.h (renamed from include/asm-blackfin/termios.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/thread_info.h (renamed from include/asm-blackfin/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/time.h (renamed from include/asm-blackfin/time.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/timex.h (renamed from include/asm-blackfin/timex.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/tlb.h (renamed from include/asm-blackfin/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/tlbflush.h (renamed from include/asm-blackfin/tlbflush.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/topology.h (renamed from include/asm-blackfin/topology.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/trace.h (renamed from include/asm-blackfin/trace.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/traps.h (renamed from include/asm-blackfin/traps.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/types.h (renamed from include/asm-blackfin/types.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/uaccess.h (renamed from include/asm-blackfin/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/ucontext.h (renamed from include/asm-blackfin/ucontext.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/unaligned.h (renamed from include/asm-blackfin/unaligned.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/unistd.h (renamed from include/asm-blackfin/unistd.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/user.h (renamed from include/asm-blackfin/user.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/head.S | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/anomaly.h (renamed from include/asm-blackfin/mach-bf527/anomaly.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/bf527.h (renamed from include/asm-blackfin/mach-bf527/bf527.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h (renamed from include/asm-blackfin/mach-bf527/bfin_serial_5xx.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/bfin_sir.h (renamed from include/asm-blackfin/mach-bf527/bfin_sir.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/blackfin.h (renamed from include/asm-blackfin/mach-bf527/blackfin.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/cdefBF522.h (renamed from include/asm-blackfin/mach-bf527/cdefBF522.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/cdefBF525.h (renamed from include/asm-blackfin/mach-bf527/cdefBF525.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/cdefBF527.h (renamed from include/asm-blackfin/mach-bf527/cdefBF527.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h (renamed from include/asm-blackfin/mach-bf527/cdefBF52x_base.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/defBF522.h (renamed from include/asm-blackfin/mach-bf527/defBF522.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/defBF525.h (renamed from include/asm-blackfin/mach-bf527/defBF525.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/defBF527.h (renamed from include/asm-blackfin/mach-bf527/defBF527.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/defBF52x_base.h (renamed from include/asm-blackfin/mach-bf527/defBF52x_base.h) | 185 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/dma.h (renamed from include/asm-blackfin/mach-bf527/dma.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/irq.h (renamed from include/asm-blackfin/mach-bf527/irq.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/mem_init.h (renamed from include/asm-blackfin/mach-bf527/mem_init.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/mem_map.h (renamed from include/asm-blackfin/mach-bf527/mem_map.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/portmux.h (renamed from include/asm-blackfin/mach-bf527/portmux.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/head.S | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/anomaly.h (renamed from include/asm-blackfin/mach-bf533/anomaly.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/bf533.h (renamed from include/asm-blackfin/mach-bf533/bf533.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h (renamed from include/asm-blackfin/mach-bf533/bfin_serial_5xx.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/bfin_sir.h (renamed from include/asm-blackfin/mach-bf533/bfin_sir.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/blackfin.h (renamed from include/asm-blackfin/mach-bf533/blackfin.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/cdefBF532.h (renamed from include/asm-blackfin/mach-bf533/cdefBF532.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/defBF532.h (renamed from include/asm-blackfin/mach-bf533/defBF532.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/dma.h (renamed from include/asm-blackfin/mach-bf533/dma.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/irq.h (renamed from include/asm-blackfin/mach-bf533/irq.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/mem_init.h (renamed from include/asm-blackfin/mach-bf533/mem_init.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/mem_map.h (renamed from include/asm-blackfin/mach-bf533/mem_map.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/portmux.h (renamed from include/asm-blackfin/mach-bf533/portmux.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 27 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/head.S | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/anomaly.h (renamed from include/asm-blackfin/mach-bf537/anomaly.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/bf537.h (renamed from include/asm-blackfin/mach-bf537/bf537.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h (renamed from include/asm-blackfin/mach-bf537/bfin_serial_5xx.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/bfin_sir.h (renamed from include/asm-blackfin/mach-bf537/bfin_sir.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/blackfin.h (renamed from include/asm-blackfin/mach-bf537/blackfin.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/cdefBF534.h (renamed from include/asm-blackfin/mach-bf537/cdefBF534.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/cdefBF537.h (renamed from include/asm-blackfin/mach-bf537/cdefBF537.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/defBF534.h (renamed from include/asm-blackfin/mach-bf537/defBF534.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/defBF537.h (renamed from include/asm-blackfin/mach-bf537/defBF537.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/dma.h (renamed from include/asm-blackfin/mach-bf537/dma.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/irq.h (renamed from include/asm-blackfin/mach-bf537/irq.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/mem_init.h (renamed from include/asm-blackfin/mach-bf537/mem_init.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/mem_map.h (renamed from include/asm-blackfin/mach-bf537/mem_map.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/portmux.h (renamed from include/asm-blackfin/mach-bf537/portmux.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/head.S | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/anomaly.h (renamed from include/asm-blackfin/mach-bf548/anomaly.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/bf548.h (renamed from include/asm-blackfin/mach-bf548/bf548.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h (renamed from include/asm-blackfin/mach-bf548/bf54x-lq043.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/bf54x_keys.h (renamed from include/asm-blackfin/mach-bf548/bf54x_keys.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h (renamed from include/asm-blackfin/mach-bf548/bfin_serial_5xx.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/bfin_sir.h (renamed from include/asm-blackfin/mach-bf548/bfin_sir.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/blackfin.h (renamed from include/asm-blackfin/mach-bf548/blackfin.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF542.h (renamed from include/asm-blackfin/mach-bf548/cdefBF542.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF544.h (renamed from include/asm-blackfin/mach-bf548/cdefBF544.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF547.h (renamed from include/asm-blackfin/mach-bf548/cdefBF547.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF548.h (renamed from include/asm-blackfin/mach-bf548/cdefBF548.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF549.h (renamed from include/asm-blackfin/mach-bf548/cdefBF549.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h (renamed from include/asm-blackfin/mach-bf548/cdefBF54x_base.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF542.h (renamed from include/asm-blackfin/mach-bf548/defBF542.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF544.h (renamed from include/asm-blackfin/mach-bf548/defBF544.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF547.h (renamed from include/asm-blackfin/mach-bf548/defBF547.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF548.h (renamed from include/asm-blackfin/mach-bf548/defBF548.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF549.h (renamed from include/asm-blackfin/mach-bf548/defBF549.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF54x_base.h (renamed from include/asm-blackfin/mach-bf548/defBF54x_base.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/dma.h (renamed from include/asm-blackfin/mach-bf548/dma.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/gpio.h (renamed from include/asm-blackfin/mach-bf548/gpio.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/irq.h (renamed from include/asm-blackfin/mach-bf548/irq.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/mem_init.h (renamed from include/asm-blackfin/mach-bf548/mem_init.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/mem_map.h (renamed from include/asm-blackfin/mach-bf548/mem_map.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/portmux.h (renamed from include/asm-blackfin/mach-bf548/portmux.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/head.S | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/anomaly.h (renamed from include/asm-blackfin/mach-bf561/anomaly.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/bf561.h (renamed from include/asm-blackfin/mach-bf561/bf561.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h (renamed from include/asm-blackfin/mach-bf561/bfin_serial_5xx.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/bfin_sir.h (renamed from include/asm-blackfin/mach-bf561/bfin_sir.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/blackfin.h (renamed from include/asm-blackfin/mach-bf561/blackfin.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/cdefBF561.h (renamed from include/asm-blackfin/mach-bf561/cdefBF561.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/defBF561.h (renamed from include/asm-blackfin/mach-bf561/defBF561.h) | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/dma.h (renamed from include/asm-blackfin/mach-bf561/dma.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/irq.h (renamed from include/asm-blackfin/mach-bf561/irq.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/mem_init.h (renamed from include/asm-blackfin/mach-bf561/mem_init.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/mem_map.h (renamed from include/asm-blackfin/mach-bf561/mem_map.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/portmux.h (renamed from include/asm-blackfin/mach-bf561/portmux.h) | 0 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/arch_checks.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/dpmc_modes.S | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/entry.S | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/interrupt.S | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/mm/blackfin_sram.c | 24 | ||||
| -rw-r--r-- | drivers/input/keyboard/bf54x-keys.c | 2 | ||||
| -rw-r--r-- | drivers/serial/bfin_5xx.c | 2 | ||||
| -rw-r--r-- | drivers/video/bf54x-lq043fb.c | 2 |
217 files changed, 200 insertions, 197 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index f64d25973a37..4154ff1101fa 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -855,6 +855,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" config PCI bool "PCI support" + depends on BROKEN help Support for PCI bus. diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 9564731ad3a8..eac0533d6e4f 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -98,36 +98,20 @@ libs-y += arch/$(ARCH)/lib/ drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/ +machdirs := $(patsubst %,arch/blackfin/mach-%/, $(machine-y)) +KBUILD_CFLAGS += -Iarch/$(ARCH)/include/ +KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include -# Update machine arch symlinks if something which affects -# them changed. We use .mach to indicate when they were updated -# last, otherwise make uses the target directory mtime. - - show_mach_symlink = : - quiet_show_mach_symlink = echo ' SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach' -silent_show_mach_symlink = : -include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf - @$($(quiet)show_mach_symlink) -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-$(ARCH) - $(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach -else - $(Q)ln -fsn mach-$(MACHINE) include/asm-$(ARCH)/mach -endif - @touch $@ +KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) CLEAN_FILES += \ - include/asm-$(ARCH)/asm-offsets.h \ + arch/$(ARCH)/include/asm/asm-offsets.h \ arch/$(ARCH)/kernel/asm-offsets.s \ - include/asm-$(ARCH)/mach \ - include/asm-$(ARCH)/.mach -archprepare: include/asm-blackfin/.mach archclean: $(Q)$(MAKE) $(clean)=$(boot) - INSTALL_PATH ?= /tftpboot boot := arch/$(ARCH)/boot BOOT_TARGETS = vmImage diff --git a/include/asm-blackfin/.gitignore b/arch/blackfin/include/asm/.gitignore index 7858564a4466..7858564a4466 100644 --- a/include/asm-blackfin/.gitignore +++ b/arch/blackfin/include/asm/.gitignore diff --git a/include/asm-blackfin/Kbuild b/arch/blackfin/include/asm/Kbuild index 606ecfdcc962..606ecfdcc962 100644 --- a/include/asm-blackfin/Kbuild +++ b/arch/blackfin/include/asm/Kbuild diff --git a/include/asm-blackfin/a.out.h b/arch/blackfin/include/asm/a.out.h index 6c3d652ebd33..6c3d652ebd33 100644 --- a/include/asm-blackfin/a.out.h +++ b/arch/blackfin/include/asm/a.out.h diff --git a/include/asm-blackfin/atomic.h b/arch/blackfin/include/asm/atomic.h index 7cf508718605..7cf508718605 100644 --- a/include/asm-blackfin/atomic.h +++ b/arch/blackfin/include/asm/atomic.h diff --git a/include/asm-blackfin/auxvec.h b/arch/blackfin/include/asm/auxvec.h index 215506cd87b7..215506cd87b7 100644 --- a/include/asm-blackfin/auxvec.h +++ b/arch/blackfin/include/asm/auxvec.h diff --git a/include/asm-blackfin/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index 7ba70de66f2b..7ba70de66f2b 100644 --- a/include/asm-blackfin/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h diff --git a/include/asm-blackfin/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h index 9fa19158e38d..9fa19158e38d 100644 --- a/include/asm-blackfin/bfin5xx_spi.h +++ b/arch/blackfin/include/asm/bfin5xx_spi.h diff --git a/include/asm-blackfin/bfin_simple_timer.h b/arch/blackfin/include/asm/bfin_simple_timer.h index fccbb595464a..fccbb595464a 100644 --- a/include/asm-blackfin/bfin_simple_timer.h +++ b/arch/blackfin/include/asm/bfin_simple_timer.h diff --git a/include/asm-blackfin/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h index c76ed8def302..c76ed8def302 100644 --- a/include/asm-blackfin/bfin_sport.h +++ b/arch/blackfin/include/asm/bfin_sport.h diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h index b39a175c79c1..b39a175c79c1 100644 --- a/include/asm-blackfin/bitops.h +++ b/arch/blackfin/include/asm/bitops.h diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h index 984b74f0a2ec..8749b0e321ab 100644 --- a/include/asm-blackfin/blackfin.h +++ b/arch/blackfin/include/asm/blackfin.h @@ -11,7 +11,7 @@ #define HI(con32) (((con32) >> 16) & 0xFFFF) #define hi(con32) (((con32) >> 16) & 0xFFFF) -#include <asm/mach/anomaly.h> +#include <mach/anomaly.h> #ifndef __ASSEMBLY__ @@ -86,7 +86,7 @@ static inline void CSYNC(void) #endif /* __ASSEMBLY__ */ -#include <asm/mach/blackfin.h> +#include <mach/blackfin.h> #include <asm/bfin-global.h> #endif /* _BLACKFIN_H_ */ diff --git a/include/asm-blackfin/bug.h b/arch/blackfin/include/asm/bug.h index 6d3e11b1fc57..6d3e11b1fc57 100644 --- a/include/asm-blackfin/bug.h +++ b/arch/blackfin/include/asm/bug.h diff --git a/include/asm-blackfin/bugs.h b/arch/blackfin/include/asm/bugs.h index 9093c9c1fb81..9093c9c1fb81 100644 --- a/include/asm-blackfin/bugs.h +++ b/arch/blackfin/include/asm/bugs.h diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h index 6a673d42da18..6a673d42da18 100644 --- a/include/asm-blackfin/byteorder.h +++ b/arch/blackfin/include/asm/byteorder.h diff --git a/include/asm-blackfin/cache.h b/arch/blackfin/include/asm/cache.h index 023d72133b5a..023d72133b5a 100644 --- a/include/asm-blackfin/cache.h +++ b/arch/blackfin/include/asm/cache.h diff --git a/include/asm-blackfin/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h index d81a77545a04..d81a77545a04 100644 --- a/include/asm-blackfin/cacheflush.h +++ b/arch/blackfin/include/asm/cacheflush.h diff --git a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h b/arch/blackfin/include/asm/cdef_LPBlackfin.h index d39c396f850d..35f841bce57d 100644 --- a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h +++ b/arch/blackfin/include/asm/cdef_LPBlackfin.h @@ -33,7 +33,7 @@ #warning cdef_LPBlackfin.h should only be included for 532 compatible chips. #endif */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /*Cache & SRAM Memory*/ #define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS) diff --git a/include/asm-blackfin/checksum.h b/arch/blackfin/include/asm/checksum.h index 6f6af2b8e9e0..6f6af2b8e9e0 100644 --- a/include/asm-blackfin/checksum.h +++ b/arch/blackfin/include/asm/checksum.h diff --git a/include/asm-blackfin/mach-common/clocks.h b/arch/blackfin/include/asm/clocks.h index 033bba92d61c..033bba92d61c 100644 --- a/include/asm-blackfin/mach-common/clocks.h +++ b/arch/blackfin/include/asm/clocks.h diff --git a/include/asm-blackfin/mach-common/context.S b/arch/blackfin/include/asm/context.S index c0e630edfb9a..c0e630edfb9a 100644 --- a/include/asm-blackfin/mach-common/context.S +++ b/arch/blackfin/include/asm/context.S diff --git a/include/asm-blackfin/cplb-mpu.h b/arch/blackfin/include/asm/cplb-mpu.h index 75c67b99d607..75c67b99d607 100644 --- a/include/asm-blackfin/cplb-mpu.h +++ b/arch/blackfin/include/asm/cplb-mpu.h diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h index 5b0da9a69b67..05d6f05fb748 100644 --- a/include/asm-blackfin/cplb.h +++ b/arch/blackfin/include/asm/cplb.h @@ -31,7 +31,7 @@ #define _CPLB_H #include <asm/blackfin.h> -#include <asm/mach/anomaly.h> +#include <mach/anomaly.h> #define SDRAM_IGENERIC (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO) #define SDRAM_IKERNEL (SDRAM_IGENERIC | CPLB_LOCK) diff --git a/include/asm-blackfin/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h index 0eb1c1b685a7..0eb1c1b685a7 100644 --- a/include/asm-blackfin/cplbinit.h +++ b/arch/blackfin/include/asm/cplbinit.h diff --git a/include/asm-blackfin/cpumask.h b/arch/blackfin/include/asm/cpumask.h index b20a8e9012cb..b20a8e9012cb 100644 --- a/include/asm-blackfin/cpumask.h +++ b/arch/blackfin/include/asm/cpumask.h diff --git a/include/asm-blackfin/cputime.h b/arch/blackfin/include/asm/cputime.h index 2b19705f9885..2b19705f9885 100644 --- a/include/asm-blackfin/cputime.h +++ b/arch/blackfin/include/asm/cputime.h diff --git a/include/asm-blackfin/current.h b/arch/blackfin/include/asm/current.h index 31918d29122c..31918d29122c 100644 --- a/include/asm-blackfin/current.h +++ b/arch/blackfin/include/asm/current.h diff --git a/include/asm-blackfin/mach-common/def_LPBlackfin.h b/arch/blackfin/include/asm/def_LPBlackfin.h index e8967f6124f7..6341eebff3dc 100644 --- a/include/asm-blackfin/mach-common/def_LPBlackfin.h +++ b/arch/blackfin/include/asm/def_LPBlackfin.h @@ -31,7 +31,7 @@ #ifndef _DEF_LPBLACKFIN_H #define _DEF_LPBLACKFIN_H -#include <asm/mach/anomaly.h> +#include <mach/anomaly.h> #define MK_BMSK_(x) (1<<x) diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h index 473a8113277f..0889c3abb593 100644 --- a/include/asm-blackfin/delay.h +++ b/arch/blackfin/include/asm/delay.h @@ -9,7 +9,7 @@ #ifndef __ASM_DELAY_H__ #define __ASM_DELAY_H__ -#include <asm/mach/anomaly.h> +#include <mach/anomaly.h> static inline void __delay(unsigned long loops) { diff --git a/include/asm-blackfin/device.h b/arch/blackfin/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-blackfin/device.h +++ b/arch/blackfin/include/asm/device.h diff --git a/include/asm-blackfin/div64.h b/arch/blackfin/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-blackfin/div64.h +++ b/arch/blackfin/include/asm/div64.h diff --git a/include/asm-blackfin/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index 1a13c2fc3667..1a13c2fc3667 100644 --- a/include/asm-blackfin/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h diff --git a/include/asm-blackfin/dma.h b/arch/blackfin/include/asm/dma.h index 3cd4b522aa3f..6509733bb0f6 100644 --- a/include/asm-blackfin/dma.h +++ b/arch/blackfin/include/asm/dma.h @@ -35,7 +35,7 @@ #include <asm/signal.h> #include <linux/kernel.h> -#include <asm/mach/dma.h> +#include <mach/dma.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <asm/blackfin.h> diff --git a/include/asm-blackfin/dpmc.h b/arch/blackfin/include/asm/dpmc.h index 96e8208f929a..96e8208f929a 100644 --- a/include/asm-blackfin/dpmc.h +++ b/arch/blackfin/include/asm/dpmc.h diff --git a/include/asm-blackfin/early_printk.h b/arch/blackfin/include/asm/early_printk.h index 110f1c1f845c..110f1c1f845c 100644 --- a/include/asm-blackfin/early_printk.h +++ b/arch/blackfin/include/asm/early_printk.h diff --git a/include/asm-blackfin/elf.h b/arch/blackfin/include/asm/elf.h index 67a03a8a353e..67a03a8a353e 100644 --- a/include/asm-blackfin/elf.h +++ b/arch/blackfin/include/asm/elf.h diff --git a/include/asm-blackfin/emergency-restart.h b/arch/blackfin/include/asm/emergency-restart.h index 27f6c785d103..27f6c785d103 100644 --- a/include/asm-blackfin/emergency-restart.h +++ b/arch/blackfin/include/asm/emergency-restart.h diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h index c4f721e0d00d..c4f721e0d00d 100644 --- a/include/asm-blackfin/entry.h +++ b/arch/blackfin/include/asm/entry.h diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h index 164e4f39bb57..164e4f39bb57 100644 --- a/include/asm-blackfin/errno.h +++ b/arch/blackfin/include/asm/errno.h diff --git a/include/asm-blackfin/fb.h b/arch/blackfin/include/asm/fb.h index c7df38030992..c7df38030992 100644 --- a/include/asm-blackfin/fb.h +++ b/arch/blackfin/include/asm/fb.h diff --git a/include/asm-blackfin/fcntl.h b/arch/blackfin/include/asm/fcntl.h index 9c4037127857..9c4037127857 100644 --- a/include/asm-blackfin/fcntl.h +++ b/arch/blackfin/include/asm/fcntl.h diff --git a/include/asm-blackfin/fixed_code.h b/arch/blackfin/include/asm/fixed_code.h index 32c4d495d847..32c4d495d847 100644 --- a/include/asm-blackfin/fixed_code.h +++ b/arch/blackfin/include/asm/fixed_code.h diff --git a/include/asm-blackfin/flat.h b/arch/blackfin/include/asm/flat.h index e70074e05f4e..e70074e05f4e 100644 --- a/include/asm-blackfin/flat.h +++ b/arch/blackfin/include/asm/flat.h diff --git a/include/asm-blackfin/futex.h b/arch/blackfin/include/asm/futex.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-blackfin/futex.h +++ b/arch/blackfin/include/asm/futex.h diff --git a/include/asm-blackfin/gpio.h b/arch/blackfin/include/asm/gpio.h index 168f1251eb4d..ad33ac271fd9 100644 --- a/include/asm-blackfin/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -224,7 +224,7 @@ #endif #ifdef BF548_FAMILY -#include <asm-blackfin/mach-bf548/gpio.h> +#include <mach/gpio.h> #endif #ifdef BF561_FAMILY diff --git a/include/asm-blackfin/gptimers.h b/arch/blackfin/include/asm/gptimers.h index 0520d2aac8f3..0520d2aac8f3 100644 --- a/include/asm-blackfin/gptimers.h +++ b/arch/blackfin/include/asm/gptimers.h diff --git a/include/asm-blackfin/hardirq.h b/arch/blackfin/include/asm/hardirq.h index b6b19f1b9dab..b6b19f1b9dab 100644 --- a/include/asm-blackfin/hardirq.h +++ b/arch/blackfin/include/asm/hardirq.h diff --git a/include/asm-blackfin/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h index 5b51eaec012c..5b51eaec012c 100644 --- a/include/asm-blackfin/hw_irq.h +++ b/arch/blackfin/include/asm/hw_irq.h diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h index cbbf7ffdbbff..cbbf7ffdbbff 100644 --- a/include/asm-blackfin/io.h +++ b/arch/blackfin/include/asm/io.h diff --git a/include/asm-blackfin/ioctl.h b/arch/blackfin/include/asm/ioctl.h index b279fe06dfe5..b279fe06dfe5 100644 --- a/include/asm-blackfin/ioctl.h +++ b/arch/blackfin/include/asm/ioctl.h diff --git a/include/asm-blackfin/ioctls.h b/arch/blackfin/include/asm/ioctls.h index 895e3173165d..895e3173165d 100644 --- a/include/asm-blackfin/ioctls.h +++ b/arch/blackfin/include/asm/ioctls.h diff --git a/include/asm-blackfin/ipcbuf.h b/arch/blackfin/include/asm/ipcbuf.h index 8f0899cdf4d2..8f0899cdf4d2 100644 --- a/include/asm-blackfin/ipcbuf.h +++ b/arch/blackfin/include/asm/ipcbuf.h diff --git a/include/asm-blackfin/irq.h b/arch/blackfin/include/asm/irq.h index 86b67834354d..89f59e18af93 100644 --- a/include/asm-blackfin/irq.h +++ b/arch/blackfin/include/asm/irq.h @@ -17,7 +17,7 @@ #ifndef _BFIN_IRQ_H_ #define _BFIN_IRQ_H_ -#include <asm/mach/irq.h> +#include <mach/irq.h> #include <asm/ptrace.h> /******************************************************************************* @@ -34,7 +34,7 @@ * interrupts apart (just the TX/RX for the various devices) *******************************************************************************/ -/* SYS_IRQS and NR_IRQS are defined in <asm/mach-bf5xx/irq.h>*/ +/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/ /* * Machine specific interrupt sources. diff --git a/include/asm-blackfin/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h index 139b5208f9d8..139b5208f9d8 100644 --- a/include/asm-blackfin/irq_handler.h +++ b/arch/blackfin/include/asm/irq_handler.h diff --git a/include/asm-blackfin/irq_regs.h b/arch/blackfin/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-blackfin/irq_regs.h +++ b/arch/blackfin/include/asm/irq_regs.h diff --git a/include/asm-blackfin/kdebug.h b/arch/blackfin/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-blackfin/kdebug.h +++ b/arch/blackfin/include/asm/kdebug.h diff --git a/include/asm-blackfin/kgdb.h b/arch/blackfin/include/asm/kgdb.h index 0f73847fd6bc..0f73847fd6bc 100644 --- a/include/asm-blackfin/kgdb.h +++ b/arch/blackfin/include/asm/kgdb.h diff --git a/include/asm-blackfin/kmap_types.h b/arch/blackfin/include/asm/kmap_types.h index e215f7104974..e215f7104974 100644 --- a/include/asm-blackfin/kmap_types.h +++ b/arch/blackfin/include/asm/kmap_types.h diff --git a/include/asm-blackfin/l1layout.h b/arch/blackfin/include/asm/l1layout.h index c13ded777828..c13ded777828 100644 --- a/include/asm-blackfin/l1layout.h +++ b/arch/blackfin/include/asm/l1layout.h diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h index 5a822bb790f7..5a822bb790f7 100644 --- a/include/asm-blackfin/linkage.h +++ b/arch/blackfin/include/asm/linkage.h diff --git a/include/asm-blackfin/local.h b/arch/blackfin/include/asm/local.h index 75afffbc6421..75afffbc6421 100644 --- a/include/asm-blackfin/local.h +++ b/arch/blackfin/include/asm/local.h diff --git a/include/asm-blackfin/mem_map.h b/arch/blackfin/include/asm/mem_map.h index 42d1f37f6d9c..88d04a707708 100644 --- a/include/asm-blackfin/mem_map.h +++ b/arch/blackfin/include/asm/mem_map.h @@ -7,6 +7,6 @@ #ifndef _MEM_MAP_H_ #define _MEM_MAP_H_ -#include <asm/mach/mem_map.h> +#include <mach/mem_map.h> #endif /* _MEM_MAP_H_ */ diff --git a/include/asm-blackfin/mman.h b/arch/blackfin/include/asm/mman.h index b58f5ad3f024..b58f5ad3f024 100644 --- a/include/asm-blackfin/mman.h +++ b/arch/blackfin/include/asm/mman.h diff --git a/include/asm-blackfin/mmu.h b/arch/blackfin/include/asm/mmu.h index 757e43906ed4..757e43906ed4 100644 --- a/include/asm-blackfin/mmu.h +++ b/arch/blackfin/include/asm/mmu.h diff --git a/include/asm-blackfin/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h index f55ec3c23a92..8529552a981f 100644 --- a/include/asm-blackfin/mmu_context.h +++ b/arch/blackfin/include/asm/mmu_context.h @@ -173,8 +173,10 @@ static inline void protect_page(struct mm_struct *mm, unsigned long addr, static inline void update_protections(struct mm_struct *mm) { - flush_switched_cplbs(); - set_mask_dcplbs(mm->context.page_rwx_mask); + if (mm->context.page_rwx_mask == current_rwx_mask) { + flush_switched_cplbs(); + set_mask_dcplbs(mm->context.page_rwx_mask); + } } #endif diff --git a/include/asm-blackfin/module.h b/arch/blackfin/include/asm/module.h index e3128df139d6..e3128df139d6 100644 --- a/include/asm-blackfin/module.h +++ b/arch/blackfin/include/asm/module.h diff --git a/include/asm-blackfin/msgbuf.h b/arch/blackfin/include/asm/msgbuf.h index 6fcbe8cd801d..6fcbe8cd801d 100644 --- a/include/asm-blackfin/msgbuf.h +++ b/arch/blackfin/include/asm/msgbuf.h diff --git a/include/asm-blackfin/mutex.h b/arch/blackfin/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-blackfin/mutex.h +++ b/arch/blackfin/include/asm/mutex.h diff --git a/include/asm-blackfin/nand.h b/arch/blackfin/include/asm/nand.h index afbaafa793f1..afbaafa793f1 100644 --- a/include/asm-blackfin/nand.h +++ b/arch/blackfin/include/asm/nand.h diff --git a/include/asm-blackfin/page.h b/arch/blackfin/include/asm/page.h index 344f6a8c1f22..344f6a8c1f22 100644 --- a/include/asm-blackfin/page.h +++ b/arch/blackfin/include/asm/page.h diff --git a/include/asm-blackfin/page_offset.h b/arch/blackfin/include/asm/page_offset.h index cbaff24b4b25..cbaff24b4b25 100644 --- a/include/asm-blackfin/page_offset.h +++ b/arch/blackfin/include/asm/page_offset.h diff --git a/include/asm-blackfin/param.h b/arch/blackfin/include/asm/param.h index 41564a6347f8..41564a6347f8 100644 --- a/include/asm-blackfin/param.h +++ b/arch/blackfin/include/asm/param.h diff --git a/include/asm-blackfin/pci.h b/arch/blackfin/include/asm/pci.h index 61277358c865..61277358c865 100644 --- a/include/asm-blackfin/pci.h +++ b/arch/blackfin/include/asm/pci.h diff --git a/include/asm-blackfin/percpu.h b/arch/blackfin/include/asm/percpu.h index 78dd61f6b39f..78dd61f6b39f 100644 --- a/include/asm-blackfin/percpu.h +++ b/arch/blackfin/include/asm/percpu.h diff --git a/include/asm-blackfin/pgalloc.h b/arch/blackfin/include/asm/pgalloc.h index c686e0542fd0..c686e0542fd0 100644 --- a/include/asm-blackfin/pgalloc.h +++ b/arch/blackfin/include/asm/pgalloc.h diff --git a/include/asm-blackfin/pgtable.h b/arch/blackfin/include/asm/pgtable.h index b11b114689c0..f11684e4ade7 100644 --- a/include/asm-blackfin/pgtable.h +++ b/arch/blackfin/include/asm/pgtable.h @@ -4,7 +4,7 @@ #include <asm-generic/4level-fixup.h> #include <asm/page.h> -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> typedef pte_t *pte_addr_t; /* diff --git a/include/asm-blackfin/poll.h b/arch/blackfin/include/asm/poll.h index 94cc2636e0e2..94cc2636e0e2 100644 --- a/include/asm-blackfin/poll.h +++ b/arch/blackfin/include/asm/poll.h diff --git a/include/asm-blackfin/portmux.h b/arch/blackfin/include/asm/portmux.h index 0807b286cd9e..88eb5c07cc24 100644 --- a/include/asm-blackfin/portmux.h +++ b/arch/blackfin/include/asm/portmux.h @@ -21,7 +21,7 @@ int peripheral_request_list(const unsigned short per[], const char *label); void peripheral_free_list(const unsigned short per[]); #include <asm/gpio.h> -#include <asm/mach/portmux.h> +#include <mach/portmux.h> #ifndef P_SPORT2_TFS #define P_SPORT2_TFS P_UNDEF diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h index 23aa1f8c1bd1..23aa1f8c1bd1 100644 --- a/include/asm-blackfin/posix_types.h +++ b/arch/blackfin/include/asm/posix_types.h diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h index 6f3995b119d8..6f3995b119d8 100644 --- a/include/asm-blackfin/processor.h +++ b/arch/blackfin/include/asm/processor.h diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h index a45a80e54adc..a45a80e54adc 100644 --- a/include/asm-blackfin/ptrace.h +++ b/arch/blackfin/include/asm/ptrace.h diff --git a/include/asm-blackfin/reboot.h b/arch/blackfin/include/asm/reboot.h index 6d448b5f5985..6d448b5f5985 100644 --- a/include/asm-blackfin/reboot.h +++ b/arch/blackfin/include/asm/reboot.h diff --git a/include/asm-blackfin/resource.h b/arch/blackfin/include/asm/resource.h index 091355ab3495..091355ab3495 100644 --- a/include/asm-blackfin/resource.h +++ b/arch/blackfin/include/asm/resource.h diff --git a/include/asm-blackfin/scatterlist.h b/arch/blackfin/include/asm/scatterlist.h index 04f448711cd0..04f448711cd0 100644 --- a/include/asm-blackfin/scatterlist.h +++ b/arch/blackfin/include/asm/scatterlist.h diff --git a/include/asm-blackfin/sections.h b/arch/blackfin/include/asm/sections.h index 1443c3353a8c..1443c3353a8c 100644 --- a/include/asm-blackfin/sections.h +++ b/arch/blackfin/include/asm/sections.h diff --git a/include/asm-blackfin/segment.h b/arch/blackfin/include/asm/segment.h index 02cfd09b5a99..02cfd09b5a99 100644 --- a/include/asm-blackfin/segment.h +++ b/arch/blackfin/include/asm/segment.h diff --git a/include/asm-blackfin/sembuf.h b/arch/blackfin/include/asm/sembuf.h index 18deb5c7fa5d..18deb5c7fa5d 100644 --- a/include/asm-blackfin/sembuf.h +++ b/arch/blackfin/include/asm/sembuf.h diff --git a/include/asm-blackfin/serial.h b/arch/blackfin/include/asm/serial.h index 994dd869558c..994dd869558c 100644 --- a/include/asm-blackfin/serial.h +++ b/arch/blackfin/include/asm/serial.h diff --git a/include/asm-blackfin/setup.h b/arch/blackfin/include/asm/setup.h index 01c8c6cbe6fc..01c8c6cbe6fc 100644 --- a/include/asm-blackfin/setup.h +++ b/arch/blackfin/include/asm/setup.h diff --git a/include/asm-blackfin/shmbuf.h b/arch/blackfin/include/asm/shmbuf.h index 612436303e89..612436303e89 100644 --- a/include/asm-blackfin/shmbuf.h +++ b/arch/blackfin/include/asm/shmbuf.h diff --git a/include/asm-blackfin/shmparam.h b/arch/blackfin/include/asm/shmparam.h index 3c03906b7664..3c03906b7664 100644 --- a/include/asm-blackfin/shmparam.h +++ b/arch/blackfin/include/asm/shmparam.h diff --git a/include/asm-blackfin/sigcontext.h b/arch/blackfin/include/asm/sigcontext.h index ce00b03c2775..ce00b03c2775 100644 --- a/include/asm-blackfin/sigcontext.h +++ b/arch/blackfin/include/asm/sigcontext.h diff --git a/include/asm-blackfin/siginfo.h b/arch/blackfin/include/asm/siginfo.h index eca4565cea37..eca4565cea37 100644 --- a/include/asm-blackfin/siginfo.h +++ b/arch/blackfin/include/asm/siginfo.h diff --git a/include/asm-blackfin/signal.h b/arch/blackfin/include/asm/signal.h index 87951d251458..87951d251458 100644 --- a/include/asm-blackfin/signal.h +++ b/arch/blackfin/include/asm/signal.h diff --git a/include/asm-blackfin/socket.h b/arch/blackfin/include/asm/socket.h index 2ca702e44d47..2ca702e44d47 100644 --- a/include/asm-blackfin/socket.h +++ b/arch/blackfin/include/asm/socket.h diff --git a/include/asm-blackfin/sockios.h b/arch/blackfin/include/asm/sockios.h index 426b89bfaa8b..426b89bfaa8b 100644 --- a/include/asm-blackfin/sockios.h +++ b/arch/blackfin/include/asm/sockios.h diff --git a/include/asm-blackfin/spinlock.h b/arch/blackfin/include/asm/spinlock.h index 64e908a50646..64e908a50646 100644 --- a/include/asm-blackfin/spinlock.h +++ b/arch/blackfin/include/asm/spinlock.h diff --git a/include/asm-blackfin/stat.h b/arch/blackfin/include/asm/stat.h index d2b6f11ec231..d2b6f11ec231 100644 --- a/include/asm-blackfin/stat.h +++ b/arch/blackfin/include/asm/stat.h diff --git a/include/asm-blackfin/statfs.h b/arch/blackfin/include/asm/statfs.h index 350672091ba3..350672091ba3 100644 --- a/include/asm-blackfin/statfs.h +++ b/arch/blackfin/include/asm/statfs.h diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h index 321f4d96e4ae..321f4d96e4ae 100644 --- a/include/asm-blackfin/string.h +++ b/arch/blackfin/include/asm/string.h diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h index 51494ef5bb41..8f1627d8bf09 100644 --- a/include/asm-blackfin/system.h +++ b/arch/blackfin/include/asm/system.h @@ -36,7 +36,7 @@ #include <linux/linkage.h> #include <linux/compiler.h> -#include <asm/mach/anomaly.h> +#include <mach/anomaly.h> /* * Interrupt configuring macros. diff --git a/include/asm-blackfin/termbits.h b/arch/blackfin/include/asm/termbits.h index f37feb7cf895..f37feb7cf895 100644 --- a/include/asm-blackfin/termbits.h +++ b/arch/blackfin/include/asm/termbits.h diff --git a/include/asm-blackfin/termios.h b/arch/blackfin/include/asm/termios.h index d50d063c605a..d50d063c605a 100644 --- a/include/asm-blackfin/termios.h +++ b/arch/blackfin/include/asm/termios.h diff --git a/include/asm-blackfin/thread_info.h b/arch/blackfin/include/asm/thread_info.h index 642769329d12..642769329d12 100644 --- a/include/asm-blackfin/thread_info.h +++ b/arch/blackfin/include/asm/thread_info.h diff --git a/include/asm-blackfin/time.h b/arch/blackfin/include/asm/time.h index ddc43ce38533..ddc43ce38533 100644 --- a/include/asm-blackfin/time.h +++ b/arch/blackfin/include/asm/time.h diff --git a/include/asm-blackfin/timex.h b/arch/blackfin/include/asm/timex.h index 22b0806161bb..22b0806161bb 100644 --- a/include/asm-blackfin/timex.h +++ b/arch/blackfin/include/asm/timex.h diff --git a/include/asm-blackfin/tlb.h b/arch/blackfin/include/asm/tlb.h index 89a12ee916d8..89a12ee916d8 100644 --- a/include/asm-blackfin/tlb.h +++ b/arch/blackfin/include/asm/tlb.h diff --git a/include/asm-blackfin/tlbflush.h b/arch/blackfin/include/asm/tlbflush.h index 277b400924b8..277b400924b8 100644 --- a/include/asm-blackfin/tlbflush.h +++ b/arch/blackfin/include/asm/tlbflush.h diff --git a/include/asm-blackfin/topology.h b/arch/blackfin/include/asm/topology.h index acee23987897..acee23987897 100644 --- a/include/asm-blackfin/topology.h +++ b/arch/blackfin/include/asm/topology.h diff --git a/include/asm-blackfin/trace.h b/arch/blackfin/include/asm/trace.h index 312b596b9731..312b596b9731 100644 --- a/include/asm-blackfin/trace.h +++ b/arch/blackfin/include/asm/trace.h diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h index f0e5f940d9ca..f0e5f940d9ca 100644 --- a/include/asm-blackfin/traps.h +++ b/arch/blackfin/include/asm/traps.h diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h index 8441cbc2bf9e..8441cbc2bf9e 100644 --- a/include/asm-blackfin/types.h +++ b/arch/blackfin/include/asm/types.h diff --git a/include/asm-blackfin/uaccess.h b/arch/blackfin/include/asm/uaccess.h index d928b8099056..d928b8099056 100644 --- a/include/asm-blackfin/uaccess.h +++ b/arch/blackfin/include/asm/uaccess.h diff --git a/include/asm-blackfin/ucontext.h b/arch/blackfin/include/asm/ucontext.h index 4a4e3856beba..4a4e3856beba 100644 --- a/include/asm-blackfin/ucontext.h +++ b/arch/blackfin/include/asm/ucontext.h diff --git a/include/asm-blackfin/unaligned.h b/arch/blackfin/include/asm/unaligned.h index fd8a1d634945..fd8a1d634945 100644 --- a/include/asm-blackfin/unaligned.h +++ b/arch/blackfin/include/asm/unaligned.h diff --git a/include/asm-blackfin/unistd.h b/arch/blackfin/include/asm/unistd.h index 1e57b636e0bc..1e57b636e0bc 100644 --- a/include/asm-blackfin/unistd.h +++ b/arch/blackfin/include/asm/unistd.h diff --git a/include/asm-blackfin/user.h b/arch/blackfin/include/asm/user.h index afe6a0e1f7ce..afe6a0e1f7ce 100644 --- a/include/asm-blackfin/user.h +++ b/arch/blackfin/include/asm/user.h diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S index 31bd9bf3efae..faea88ebb2ef 100644 --- a/arch/blackfin/kernel/entry.S +++ b/arch/blackfin/kernel/entry.S @@ -32,7 +32,7 @@ #include <asm/errno.h> #include <asm/asm-offsets.h> -#include <asm/mach-common/context.S> +#include <asm/context.S> #ifdef CONFIG_EXCPT_IRQ_SYSC_L1 .section .l1.text diff --git a/arch/blackfin/mach-bf527/head.S b/arch/blackfin/mach-bf527/head.S index c3334cc5bcb7..28c486191209 100644 --- a/arch/blackfin/mach-bf527/head.S +++ b/arch/blackfin/mach-bf527/head.S @@ -31,8 +31,8 @@ #include <linux/init.h> #include <asm/blackfin.h> #ifdef CONFIG_BFIN_KERNEL_CLOCK -#include <asm/mach-common/clocks.h> -#include <asm/mach/mem_init.h> +#include <asm/clocks.h> +#include <mach/mem_init.h> #endif .section .l1.text diff --git a/include/asm-blackfin/mach-bf527/anomaly.h b/arch/blackfin/mach-bf527/include/mach/anomaly.h index b7b166f4f064..b7b166f4f064 100644 --- a/include/asm-blackfin/mach-bf527/anomaly.h +++ b/arch/blackfin/mach-bf527/include/mach/anomaly.h diff --git a/include/asm-blackfin/mach-bf527/bf527.h b/arch/blackfin/mach-bf527/include/mach/bf527.h index 056eb4b9cd25..056eb4b9cd25 100644 --- a/include/asm-blackfin/mach-bf527/bf527.h +++ b/arch/blackfin/mach-bf527/include/mach/bf527.h diff --git a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h index 2526b6ed6faa..2526b6ed6faa 100644 --- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h diff --git a/include/asm-blackfin/mach-bf527/bfin_sir.h b/arch/blackfin/mach-bf527/include/mach/bfin_sir.h index cfd8ad4f1f2c..cfd8ad4f1f2c 100644 --- a/include/asm-blackfin/mach-bf527/bfin_sir.h +++ b/arch/blackfin/mach-bf527/include/mach/bfin_sir.h diff --git a/include/asm-blackfin/mach-bf527/blackfin.h b/arch/blackfin/mach-bf527/include/mach/blackfin.h index 297821e2d79a..297821e2d79a 100644 --- a/include/asm-blackfin/mach-bf527/blackfin.h +++ b/arch/blackfin/mach-bf527/include/mach/blackfin.h diff --git a/include/asm-blackfin/mach-bf527/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h index 52c06494b886..663c2bbdfd91 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h @@ -36,7 +36,7 @@ #include "defBF522.h" /* include core specific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ diff --git a/include/asm-blackfin/mach-bf527/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h index 2cc67e4b4d86..00377eb59b75 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h @@ -36,7 +36,7 @@ #include "defBF525.h" /* include core specific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ diff --git a/include/asm-blackfin/mach-bf527/cdefBF527.h b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h index 5bd1a8601743..fca8db708119 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h @@ -36,7 +36,7 @@ #include "defBF527.h" /* include core specific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ diff --git a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h index 9dbdbec8ea1b..9a814b9a12b9 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h @@ -37,7 +37,7 @@ #include "defBF52x_base.h" /* Include core specific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* ==== begin from cdefBF534.h ==== */ diff --git a/include/asm-blackfin/mach-bf527/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h index 9671d8f2c5ef..0a8cdcdf0b49 100644 --- a/include/asm-blackfin/mach-bf527/defBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF522.h @@ -32,7 +32,7 @@ #define _DEF_BF522_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ diff --git a/include/asm-blackfin/mach-bf527/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h index 6a375a084acc..5cd7576fef76 100644 --- a/include/asm-blackfin/mach-bf527/defBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF525.h @@ -32,7 +32,7 @@ #define _DEF_BF525_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ diff --git a/include/asm-blackfin/mach-bf527/defBF527.h b/arch/blackfin/mach-bf527/include/mach/defBF527.h index f1a70db70cb8..f040f364afa3 100644 --- a/include/asm-blackfin/mach-bf527/defBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF527.h @@ -32,7 +32,7 @@ #define _DEF_BF527_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ diff --git a/include/asm-blackfin/mach-bf527/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h index fc69cf93f149..6ac2ed7026eb 100644 --- a/include/asm-blackfin/mach-bf527/defBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h @@ -151,7 +151,7 @@ #define TIMER7_CONFIG 0xFFC00670 /* Timer 7 Configuration Register */ #define TIMER7_COUNTER 0xFFC00674 /* Timer 7 Counter Register */ #define TIMER7_PERIOD 0xFFC00678 /* Timer 7 Period Register */ -#define TIMER7_WIDTH 0xFFC0067C /* Timer 7 Width Register */ +#define TIMER7_WIDTH 0xFFC0067C /* Timer 7 Width Register */ #define TIMER_ENABLE 0xFFC00680 /* Timer Enable Register */ #define TIMER_DISABLE 0xFFC00684 /* Timer Disable Register */ @@ -634,18 +634,9 @@ /* PLL_DIV Macros */ #define SET_SSEL(x) ((x)&0xF) /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */ -/* VR_CTL Masks */ -#define FREQ 0x0003 /* Switching Oscillator Frequency For Regulator */ +/* VR_CTL Masks */ +#define FREQ 0x3000 /* Switching Oscillator Frequency For Regulator */ #define HIBERNATE 0x0000 /* Powerdown/Bypass On-Board Regulation */ -#define FREQ_333 0x0001 /* Switching Frequency Is 333 kHz */ -#define FREQ_667 0x0002 /* Switching Frequency Is 667 kHz */ -#define FREQ_1000 0x0003 /* Switching Frequency Is 1 MHz */ - -#define GAIN 0x000C /* Voltage Level Gain */ -#define GAIN_5 0x0000 /* GAIN = 5 */ -#define GAIN_10 0x0004 /* GAIN = 10 */ -#define GAIN_20 0x0008 /* GAIN = 20 */ -#define GAIN_50 0x000C /* GAIN = 50 */ #define VLEV 0x00F0 /* Internal Voltage Level */ #define VLEV_085 0x0060 /* VLEV = 0.85 V (-5% - +10% Accuracy) */ @@ -660,7 +651,7 @@ #define VLEV_130 0x00F0 /* VLEV = 1.30 V (-5% - +10% Accuracy) */ #define WAKE 0x0100 /* Enable RTC/Reset Wakeup From Hibernate */ -#define CANWE 0x0200 /* Enable CAN Wakeup From Hibernate */ +#define USBWE 0x0200 /* Enable USB Wakeup From Hibernate */ #define PHYWE 0x0400 /* Enable PHY Wakeup From Hibernate */ #define CLKBUFOE 0x4000 /* CLKIN Buffer Output Enable */ #define PHYCLKOE CLKBUFOE /* Alternative legacy name for the above */ @@ -697,16 +688,16 @@ #define IRQ_ERROR1 0x00000002 /* Error Interrupt (DMA, DMARx Block, DMARx Overflow) */ #define IRQ_ERROR2 0x00000004 /* Error Interrupt (CAN, Ethernet, SPORTx, PPI, SPI, UARTx) */ -#define IRQ_RTC 0x00000008 /* Real Time Clock Interrupt */ -#define IRQ_DMA0 0x00000010 /* DMA Channel 0 (PPI) Interrupt */ -#define IRQ_DMA3 0x00000020 /* DMA Channel 3 (SPORT0 RX) Interrupt */ +#define IRQ_RTC 0x00000008 /* Real Time Clock Interrupt */ +#define IRQ_DMA0 0x00000010 /* DMA Channel 0 (PPI) Interrupt */ +#define IRQ_DMA3 0x00000020 /* DMA Channel 3 (SPORT0 RX) Interrupt */ #define IRQ_DMA4 0x00000040 /* DMA Channel 4 (SPORT0 TX) Interrupt */ #define IRQ_DMA5 0x00000080 /* DMA Channel 5 (SPORT1 RX) Interrupt */ #define IRQ_DMA6 0x00000100 /* DMA Channel 6 (SPORT1 TX) Interrupt */ #define IRQ_TWI 0x00000200 /* TWI Interrupt */ #define IRQ_DMA7 0x00000400 /* DMA Channel 7 (SPI) Interrupt */ -#define IRQ_DMA8 0x00000800 /* DMA Channel 8 (UART0 RX) Interrupt */ +#define IRQ_DMA8 0x00000800 /* DMA Channel 8 (UART0 RX) Interrupt */ #define IRQ_DMA9 0x00001000 /* DMA Channel 9 (UART0 TX) Interrupt */ #define IRQ_DMA10 0x00002000 /* DMA Channel 10 (UART1 RX) Interrupt */ #define IRQ_DMA11 0x00004000 /* DMA Channel 11 (UART1 TX) Interrupt */ @@ -801,7 +792,7 @@ #define WDEV_NONE 0x0006 /* no event on roll over */ #define WDEN 0x0FF0 /* enable watchdog */ #define WDDIS 0x0AD0 /* disable watchdog */ -#define WDRO 0x8000 /* watchdog rolled over latch */ +#define WDRO 0x8000 /* watchdog rolled over latch */ /* depreciated WDOG_CTL Register Masks for legacy code */ @@ -882,7 +873,7 @@ #define NINT 0x01 /* Pending Interrupt */ #define IIR_TX_READY 0x02 /* UART_THR empty */ #define IIR_RX_READY 0x04 /* Receive data ready */ -#define IIR_LINE_CHANGE 0x06 /* Receive line status */ +#define IIR_LINE_CHANGE 0x06 /* Receive line status */ #define IIR_STATUS 0x06 /* Highest Priority Pending Interrupt */ /* UARTx_GCTL Masks */ @@ -1638,12 +1629,12 @@ /* entry addresses of the user-callable Boot ROM functions */ -#define _BOOTROM_RESET 0xEF000000 -#define _BOOTROM_FINAL_INIT 0xEF000002 +#define _BOOTROM_RESET 0xEF000000 +#define _BOOTROM_FINAL_INIT 0xEF000002 #define _BOOTROM_DO_MEMORY_DMA 0xEF000006 -#define _BOOTROM_BOOT_DXE_FLASH 0xEF000008 -#define _BOOTROM_BOOT_DXE_SPI 0xEF00000A -#define _BOOTROM_BOOT_DXE_TWI 0xEF00000C +#define _BOOTROM_BOOT_DXE_FLASH 0xEF000008 +#define _BOOTROM_BOOT_DXE_SPI 0xEF00000A +#define _BOOTROM_BOOT_DXE_TWI 0xEF00000C #define _BOOTROM_GET_DXE_ADDRESS_FLASH 0xEF000010 #define _BOOTROM_GET_DXE_ADDRESS_SPI 0xEF000012 #define _BOOTROM_GET_DXE_ADDRESS_TWI 0xEF000014 @@ -1771,71 +1762,71 @@ /* Bit masks for CNT_CONFIG */ #define CNTE 0x1 /* Counter Enable */ -#define nCNTE 0x0 +#define nCNTE 0x0 #define DEBE 0x2 /* Debounce Enable */ -#define nDEBE 0x0 +#define nDEBE 0x0 #define CDGINV 0x10 /* CDG Pin Polarity Invert */ -#define nCDGINV 0x0 +#define nCDGINV 0x0 #define CUDINV 0x20 /* CUD Pin Polarity Invert */ -#define nCUDINV 0x0 +#define nCUDINV 0x0 #define CZMINV 0x40 /* CZM Pin Polarity Invert */ -#define nCZMINV 0x0 +#define nCZMINV 0x0 #define CNTMODE 0x700 /* Counter Operating Mode */ #define ZMZC 0x800 /* CZM Zeroes Counter Enable */ -#define nZMZC 0x0 +#define nZMZC 0x0 #define BNDMODE 0x3000 /* Boundary register Mode */ #define INPDIS 0x8000 /* CUG and CDG Input Disable */ -#define nINPDIS 0x0 +#define nINPDIS 0x0 /* Bit masks for CNT_IMASK */ #define ICIE 0x1 /* Illegal Gray/Binary Code Interrupt Enable */ -#define nICIE 0x0 +#define nICIE 0x0 #define UCIE 0x2 /* Up count Interrupt Enable */ -#define nUCIE 0x0 +#define nUCIE 0x0 #define DCIE 0x4 /* Down count Interrupt Enable */ -#define nDCIE 0x0 +#define nDCIE 0x0 #define MINCIE 0x8 /* Min Count Interrupt Enable */ -#define nMINCIE 0x0 +#define nMINCIE 0x0 #define MAXCIE 0x10 /* Max Count Interrupt Enable */ -#define nMAXCIE 0x0 +#define nMAXCIE 0x0 #define COV31IE 0x20 /* Bit 31 Overflow Interrupt Enable */ -#define nCOV31IE 0x0 +#define nCOV31IE 0x0 #define COV15IE 0x40 /* Bit 15 Overflow Interrupt Enable */ -#define nCOV15IE 0x0 +#define nCOV15IE 0x0 #define CZEROIE 0x80 /* Count to Zero Interrupt Enable */ -#define nCZEROIE 0x0 +#define nCZEROIE 0x0 #define CZMIE 0x100 /* CZM Pin Interrupt Enable */ -#define nCZMIE 0x0 +#define nCZMIE 0x0 #define CZMEIE 0x200 /* CZM Error Interrupt Enable */ -#define nCZMEIE 0x0 +#define nCZMEIE 0x0 #define CZMZIE 0x400 /* CZM Zeroes Counter Interrupt Enable */ -#define nCZMZIE 0x0 +#define nCZMZIE 0x0 /* Bit masks for CNT_STATUS */ #define ICII 0x1 /* Illegal Gray/Binary Code Interrupt Identifier */ -#define nICII 0x0 +#define nICII 0x0 #define UCII 0x2 /* Up count Interrupt Identifier */ -#define nUCII 0x0 +#define nUCII 0x0 #define DCII 0x4 /* Down count Interrupt Identifier */ -#define nDCII 0x0 +#define nDCII 0x0 #define MINCII 0x8 /* Min Count Interrupt Identifier */ -#define nMINCII 0x0 +#define nMINCII 0x0 #define MAXCII 0x10 /* Max Count Interrupt Identifier */ -#define nMAXCII 0x0 +#define nMAXCII 0x0 #define COV31II 0x20 /* Bit 31 Overflow Interrupt Identifier */ -#define nCOV31II 0x0 +#define nCOV31II 0x0 #define COV15II 0x40 /* Bit 15 Overflow Interrupt Identifier */ -#define nCOV15II 0x0 +#define nCOV15II 0x0 #define CZEROII 0x80 /* Count to Zero Interrupt Identifier */ -#define nCZEROII 0x0 +#define nCZEROII 0x0 #define CZMII 0x100 /* CZM Pin Interrupt Identifier */ -#define nCZMII 0x0 +#define nCZMII 0x0 #define CZMEII 0x200 /* CZM Error Interrupt Identifier */ -#define nCZMEII 0x0 +#define nCZMEII 0x0 #define CZMZII 0x400 /* CZM Zeroes Counter Interrupt Identifier */ -#define nCZMZII 0x0 +#define nCZMZII 0x0 /* Bit masks for CNT_COMMAND */ @@ -1843,7 +1834,7 @@ #define W1LMIN 0xf0 /* Load Min Register */ #define W1LMAX 0xf00 /* Load Max Register */ #define W1ZMONCE 0x1000 /* Enable CZM Clear Counter Once */ -#define nW1ZMONCE 0x0 +#define nW1ZMONCE 0x0 /* Bit masks for CNT_DEBOUNCE */ @@ -1853,15 +1844,15 @@ #define FUSE_FADDR 0x1ff /* OTP/Fuse Address */ #define FIEN 0x800 /* OTP/Fuse Interrupt Enable */ -#define nFIEN 0x0 +#define nFIEN 0x0 #define FTESTDEC 0x1000 /* OTP/Fuse Test Decoder */ -#define nFTESTDEC 0x0 +#define nFTESTDEC 0x0 #define FWRTEST 0x2000 /* OTP/Fuse Write Test */ -#define nFWRTEST 0x0 +#define nFWRTEST 0x0 #define FRDEN 0x4000 /* OTP/Fuse Read Enable */ -#define nFRDEN 0x0 +#define nFRDEN 0x0 #define FWREN 0x8000 /* OTP/Fuse Write Enable */ -#define nFWREN 0x0 +#define nFWREN 0x0 /* Bit masks for OTP_BEN */ @@ -1870,15 +1861,15 @@ /* Bit masks for OTP_STATUS */ #define FCOMP 0x1 /* OTP/Fuse Access Complete */ -#define nFCOMP 0x0 +#define nFCOMP 0x0 #define FERROR 0x2 /* OTP/Fuse Access Error */ -#define nFERROR 0x0 +#define nFERROR 0x0 #define MMRGLOAD 0x10 /* Memory Mapped Register Gasket Load */ -#define nMMRGLOAD 0x0 +#define nMMRGLOAD 0x0 #define MMRGLOCK 0x20 /* Memory Mapped Register Gasket Lock */ -#define nMMRGLOCK 0x0 +#define nMMRGLOCK 0x0 #define FPGMEN 0x40 /* OTP/Fuse Program Enable */ -#define nFPGMEN 0x0 +#define nFPGMEN 0x0 /* Bit masks for OTP_TIMING */ @@ -1892,42 +1883,42 @@ /* Bit masks for SECURE_SYSSWT */ #define EMUDABL 0x1 /* Emulation Disable. */ -#define nEMUDABL 0x0 +#define nEMUDABL 0x0 #define RSTDABL 0x2 /* Reset Disable */ -#define nRSTDABL 0x0 +#define nRSTDABL 0x0 #define L1IDABL 0x1c /* L1 Instruction Memory Disable. */ #define L1DADABL 0xe0 /* L1 Data Bank A Memory Disable. */ #define L1DBDABL 0x700 /* L1 Data Bank B Memory Disable. */ #define DMA0OVR 0x800 /* DMA0 Memory Access Override */ -#define nDMA0OVR 0x0 +#define nDMA0OVR 0x0 #define DMA1OVR 0x1000 /* DMA1 Memory Access Override */ -#define nDMA1OVR 0x0 +#define nDMA1OVR 0x0 #define EMUOVR 0x4000 /* Emulation Override */ -#define nEMUOVR 0x0 +#define nEMUOVR 0x0 #define OTPSEN 0x8000 /* OTP Secrets Enable. */ -#define nOTPSEN 0x0 +#define nOTPSEN 0x0 #define L2DABL 0x70000 /* L2 Memory Disable. */ /* Bit masks for SECURE_CONTROL */ #define SECURE0 0x1 /* SECURE 0 */ -#define nSECURE0 0x0 +#define nSECURE0 0x0 #define SECURE1 0x2 /* SECURE 1 */ -#define nSECURE1 0x0 +#define nSECURE1 0x0 #define SECURE2 0x4 /* SECURE 2 */ -#define nSECURE2 0x0 +#define nSECURE2 0x0 #define SECURE3 0x8 /* SECURE 3 */ -#define nSECURE3 0x0 +#define nSECURE3 0x0 /* Bit masks for SECURE_STATUS */ #define SECMODE 0x3 /* Secured Mode Control State */ #define NMI 0x4 /* Non Maskable Interrupt */ -#define nNMI 0x0 +#define nNMI 0x0 #define AFVALID 0x8 /* Authentication Firmware Valid */ -#define nAFVALID 0x0 +#define nAFVALID 0x0 #define AFEXIT 0x10 /* Authentication Firmware Exit */ -#define nAFEXIT 0x0 +#define nAFEXIT 0x0 #define SECSTAT 0xe0 /* Secure Status */ /* Bit masks for NFC_CTL */ @@ -1935,60 +1926,60 @@ #define WR_DLY 0xf /* Write Strobe Delay */ #define RD_DLY 0xf0 /* Read Strobe Delay */ #define NWIDTH 0x100 /* NAND Data Width */ -#define nNWIDTH 0x0 +#define nNWIDTH 0x0 #define PG_SIZE 0x200 /* Page Size */ -#define nPG_SIZE 0x0 +#define nPG_SIZE 0x0 /* Bit masks for NFC_STAT */ #define NBUSY 0x1 /* Not Busy */ -#define nNBUSY 0x0 +#define nNBUSY 0x0 #define WB_FULL 0x2 /* Write Buffer Full */ -#define nWB_FULL 0x0 +#define nWB_FULL 0x0 #define PG_WR_STAT 0x4 /* Page Write Pending */ -#define nPG_WR_STAT 0x0 +#define nPG_WR_STAT 0x0 #define PG_RD_STAT 0x8 /* Page Read Pending */ -#define nPG_RD_STAT 0x0 +#define nPG_RD_STAT 0x0 #define WB_EMPTY 0x10 /* Write Buffer Empty */ -#define nWB_EMPTY 0x0 +#define nWB_EMPTY 0x0 /* Bit masks for NFC_IRQSTAT */ #define NBUSYIRQ 0x1 /* Not Busy IRQ */ -#define nNBUSYIRQ 0x0 +#define nNBUSYIRQ 0x0 #define WB_OVF 0x2 /* Write Buffer Overflow */ -#define nWB_OVF 0x0 +#define nWB_OVF 0x0 #define WB_EDGE 0x4 /* Write Buffer Edge Detect */ -#define nWB_EDGE 0x0 +#define nWB_EDGE 0x0 #define RD_RDY 0x8 /* Read Data Ready */ -#define nRD_RDY 0x0 +#define nRD_RDY 0x0 #define WR_DONE 0x10 /* Page Write Done */ -#define nWR_DONE 0x0 +#define nWR_DONE 0x0 /* Bit masks for NFC_IRQMASK */ #define MASK_BUSYIRQ 0x1 /* Mask Not Busy IRQ */ -#define nMASK_BUSYIRQ 0x0 +#define nMASK_BUSYIRQ 0x0 #define MASK_WBOVF 0x2 /* Mask Write Buffer Overflow */ -#define nMASK_WBOVF 0x0 +#define nMASK_WBOVF 0x0 #define MASK_WBEMPTY 0x4 /* Mask Write Buffer Empty */ -#define nMASK_WBEMPTY 0x0 +#define nMASK_WBEMPTY 0x0 #define MASK_RDRDY 0x8 /* Mask Read Data Ready */ -#define nMASK_RDRDY 0x0 +#define nMASK_RDRDY 0x0 #define MASK_WRDONE 0x10 /* Mask Write Done */ -#define nMASK_WRDONE 0x0 +#define nMASK_WRDONE 0x0 /* Bit masks for NFC_RST */ #define ECC_RST 0x1 /* ECC (and NFC counters) Reset */ -#define nECC_RST 0x0 +#define nECC_RST 0x0 /* Bit masks for NFC_PGCTL */ #define PG_RD_START 0x1 /* Page Read Start */ -#define nPG_RD_START 0x0 +#define nPG_RD_START 0x0 #define PG_WR_START 0x2 /* Page Write Start */ -#define nPG_WR_START 0x0 +#define nPG_WR_START 0x0 /* Bit masks for NFC_ECC0 */ diff --git a/include/asm-blackfin/mach-bf527/dma.h b/arch/blackfin/mach-bf527/include/mach/dma.h index 49dd693223e8..49dd693223e8 100644 --- a/include/asm-blackfin/mach-bf527/dma.h +++ b/arch/blackfin/mach-bf527/include/mach/dma.h diff --git a/include/asm-blackfin/mach-bf527/irq.h b/arch/blackfin/mach-bf527/include/mach/irq.h index 4e2b3f2020e5..4e2b3f2020e5 100644 --- a/include/asm-blackfin/mach-bf527/irq.h +++ b/arch/blackfin/mach-bf527/include/mach/irq.h diff --git a/include/asm-blackfin/mach-bf527/mem_init.h b/arch/blackfin/mach-bf527/include/mach/mem_init.h index cbe03f4a5698..cbe03f4a5698 100644 --- a/include/asm-blackfin/mach-bf527/mem_init.h +++ b/arch/blackfin/mach-bf527/include/mach/mem_init.h diff --git a/include/asm-blackfin/mach-bf527/mem_map.h b/arch/blackfin/mach-bf527/include/mach/mem_map.h index ef46dc991cd4..ef46dc991cd4 100644 --- a/include/asm-blackfin/mach-bf527/mem_map.h +++ b/arch/blackfin/mach-bf527/include/mach/mem_map.h diff --git a/include/asm-blackfin/mach-bf527/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h index ae4d205bfcf5..ae4d205bfcf5 100644 --- a/include/asm-blackfin/mach-bf527/portmux.h +++ b/arch/blackfin/mach-bf527/include/mach/portmux.h diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S index d59db86195b6..01b2b7ead5ab 100644 --- a/arch/blackfin/mach-bf533/head.S +++ b/arch/blackfin/mach-bf533/head.S @@ -31,8 +31,8 @@ #include <linux/init.h> #include <asm/blackfin.h> #ifdef CONFIG_BFIN_KERNEL_CLOCK -#include <asm/mach-common/clocks.h> -#include <asm/mach/mem_init.h> +#include <asm/clocks.h> +#include <mach/mem_init.h> #endif .section .l1.text diff --git a/include/asm-blackfin/mach-bf533/anomaly.h b/arch/blackfin/mach-bf533/include/mach/anomaly.h index 8f7ea112fd3a..8f7ea112fd3a 100644 --- a/include/asm-blackfin/mach-bf533/anomaly.h +++ b/arch/blackfin/mach-bf533/include/mach/anomaly.h diff --git a/include/asm-blackfin/mach-bf533/bf533.h b/arch/blackfin/mach-bf533/include/mach/bf533.h index 12a416931991..12a416931991 100644 --- a/include/asm-blackfin/mach-bf533/bf533.h +++ b/arch/blackfin/mach-bf533/include/mach/bf533.h diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h index ebf592b59aab..ebf592b59aab 100644 --- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h diff --git a/include/asm-blackfin/mach-bf533/bfin_sir.h b/arch/blackfin/mach-bf533/include/mach/bfin_sir.h index 9bb87e9e2e9b..9bb87e9e2e9b 100644 --- a/include/asm-blackfin/mach-bf533/bfin_sir.h +++ b/arch/blackfin/mach-bf533/include/mach/bfin_sir.h diff --git a/include/asm-blackfin/mach-bf533/blackfin.h b/arch/blackfin/mach-bf533/include/mach/blackfin.h index d80971b4e3aa..d80971b4e3aa 100644 --- a/include/asm-blackfin/mach-bf533/blackfin.h +++ b/arch/blackfin/mach-bf533/include/mach/blackfin.h diff --git a/include/asm-blackfin/mach-bf533/cdefBF532.h b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h index 154655452d4c..3d8978a52c17 100644 --- a/include/asm-blackfin/mach-bf533/cdefBF532.h +++ b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h @@ -37,7 +37,7 @@ #include "defBF532.h" /*include core specific register pointer definitions*/ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> #include <asm/system.h> diff --git a/include/asm-blackfin/mach-bf533/defBF532.h b/arch/blackfin/mach-bf533/include/mach/defBF532.h index 0ab4dd7494cf..7f4633223e6d 100644 --- a/include/asm-blackfin/mach-bf533/defBF532.h +++ b/arch/blackfin/mach-bf533/include/mach/defBF532.h @@ -48,7 +48,7 @@ #define _DEF_BF532_H /* include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /*********************************************************************************** */ /* System MMR Register Map */ diff --git a/include/asm-blackfin/mach-bf533/dma.h b/arch/blackfin/mach-bf533/include/mach/dma.h index bd9d5e94307d..bd9d5e94307d 100644 --- a/include/asm-blackfin/mach-bf533/dma.h +++ b/arch/blackfin/mach-bf533/include/mach/dma.h diff --git a/include/asm-blackfin/mach-bf533/irq.h b/arch/blackfin/mach-bf533/include/mach/irq.h index 5aa38e5da6b7..5aa38e5da6b7 100644 --- a/include/asm-blackfin/mach-bf533/irq.h +++ b/arch/blackfin/mach-bf533/include/mach/irq.h diff --git a/include/asm-blackfin/mach-bf533/mem_init.h b/arch/blackfin/mach-bf533/include/mach/mem_init.h index ed2034bf10ec..ed2034bf10ec 100644 --- a/include/asm-blackfin/mach-bf533/mem_init.h +++ b/arch/blackfin/mach-bf533/include/mach/mem_init.h diff --git a/include/asm-blackfin/mach-bf533/mem_map.h b/arch/blackfin/mach-bf533/include/mach/mem_map.h index 581fc6eea789..581fc6eea789 100644 --- a/include/asm-blackfin/mach-bf533/mem_map.h +++ b/arch/blackfin/mach-bf533/include/mach/mem_map.h diff --git a/include/asm-blackfin/mach-bf533/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h index 685a2651dcda..685a2651dcda 100644 --- a/include/asm-blackfin/mach-bf533/portmux.h +++ b/arch/blackfin/mach-bf533/include/mach/portmux.h diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index e93964fdb432..8482d22321f3 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c @@ -584,6 +584,30 @@ static struct bfin5xx_spi_chip spidev_chip_info = { #if defined(CONFIG_MTD_DATAFLASH) \ || defined(CONFIG_MTD_DATAFLASH_MODULE) + +static struct mtd_partition bfin_spi_dataflash_partitions[] = { + { + .name = "bootloader(spi)", + .size = 0x00040000, + .offset = 0, + .mask_flags = MTD_CAP_ROM + }, { + .name = "linux kernel(spi)", + .size = 0xe0000, + .offset = MTDPART_OFS_APPEND, + }, { + .name = "file system(spi)", + .size = MTDPART_SIZ_FULL, + .offset = MTDPART_OFS_APPEND, + } +}; + +static struct flash_platform_data bfin_spi_dataflash_data = { + .name = "SPI Dataflash", + .parts = bfin_spi_dataflash_partitions, + .nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions), +}; + /* DataFlash chip */ static struct bfin5xx_spi_chip data_flash_chip_info = { .enable_dma = 0, /* use dma transfer with this chip*/ @@ -609,9 +633,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { || defined(CONFIG_MTD_DATAFLASH_MODULE) { /* DataFlash chip */ .modalias = "mtd_dataflash", - .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ + .max_speed_hz = 33250000, /* max spi clock (SCK) speed in HZ */ .bus_num = 0, /* Framework bus number */ .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ + .platform_data = &bfin_spi_dataflash_data, .controller_data = &data_flash_chip_info, .mode = SPI_MODE_3, }, diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S index 64e0287ab266..12eb5cc571d0 100644 --- a/arch/blackfin/mach-bf537/head.S +++ b/arch/blackfin/mach-bf537/head.S @@ -31,8 +31,8 @@ #include <linux/init.h> #include <asm/blackfin.h> #ifdef CONFIG_BFIN_KERNEL_CLOCK -#include <asm/mach-common/clocks.h> -#include <asm/mach/mem_init.h> +#include <asm/clocks.h> +#include <mach/mem_init.h> #endif .section .l1.text diff --git a/include/asm-blackfin/mach-bf537/anomaly.h b/arch/blackfin/mach-bf537/include/mach/anomaly.h index 8460ab9c324f..8460ab9c324f 100644 --- a/include/asm-blackfin/mach-bf537/anomaly.h +++ b/arch/blackfin/mach-bf537/include/mach/anomaly.h diff --git a/include/asm-blackfin/mach-bf537/bf537.h b/arch/blackfin/mach-bf537/include/mach/bf537.h index cfe2a221112e..cfe2a221112e 100644 --- a/include/asm-blackfin/mach-bf537/bf537.h +++ b/arch/blackfin/mach-bf537/include/mach/bf537.h diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h index 1bf56ffa22f9..1bf56ffa22f9 100644 --- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h diff --git a/include/asm-blackfin/mach-bf537/bfin_sir.h b/arch/blackfin/mach-bf537/include/mach/bfin_sir.h index cfd8ad4f1f2c..cfd8ad4f1f2c 100644 --- a/include/asm-blackfin/mach-bf537/bfin_sir.h +++ b/arch/blackfin/mach-bf537/include/mach/bfin_sir.h diff --git a/include/asm-blackfin/mach-bf537/blackfin.h b/arch/blackfin/mach-bf537/include/mach/blackfin.h index cffc786b2a2b..cffc786b2a2b 100644 --- a/include/asm-blackfin/mach-bf537/blackfin.h +++ b/arch/blackfin/mach-bf537/include/mach/blackfin.h diff --git a/include/asm-blackfin/mach-bf537/cdefBF534.h b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h index 82de526f8097..88d491cd9f36 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h @@ -38,7 +38,7 @@ #include "defBF534.h" /* Include core specific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> #include <asm/system.h> diff --git a/include/asm-blackfin/mach-bf537/cdefBF537.h b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h index b8fc949a991f..b8fc949a991f 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h diff --git a/include/asm-blackfin/mach-bf537/defBF534.h b/arch/blackfin/mach-bf537/include/mach/defBF534.h index d0d80d3152ba..a3227f9003ff 100644 --- a/include/asm-blackfin/mach-bf537/defBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF534.h @@ -32,7 +32,7 @@ #define _DEF_BF534_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /************************************************************************************ ** System MMR Register Map diff --git a/include/asm-blackfin/mach-bf537/defBF537.h b/arch/blackfin/mach-bf537/include/mach/defBF537.h index abde24c6d3b1..3d6c83e31b1e 100644 --- a/include/asm-blackfin/mach-bf537/defBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF537.h @@ -33,7 +33,7 @@ #define _DEF_BF537_H /* Include all Core registers and bit definitions*/ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* Include all MMR and bit defines common to BF534 */ #include "defBF534.h" diff --git a/include/asm-blackfin/mach-bf537/dma.h b/arch/blackfin/mach-bf537/include/mach/dma.h index 7a964040870a..7a964040870a 100644 --- a/include/asm-blackfin/mach-bf537/dma.h +++ b/arch/blackfin/mach-bf537/include/mach/dma.h diff --git a/include/asm-blackfin/mach-bf537/irq.h b/arch/blackfin/mach-bf537/include/mach/irq.h index 2e68a8a1e730..2e68a8a1e730 100644 --- a/include/asm-blackfin/mach-bf537/irq.h +++ b/arch/blackfin/mach-bf537/include/mach/irq.h diff --git a/include/asm-blackfin/mach-bf537/mem_init.h b/arch/blackfin/mach-bf537/include/mach/mem_init.h index f67698f670ca..f67698f670ca 100644 --- a/include/asm-blackfin/mach-bf537/mem_init.h +++ b/arch/blackfin/mach-bf537/include/mach/mem_init.h diff --git a/include/asm-blackfin/mach-bf537/mem_map.h b/arch/blackfin/mach-bf537/include/mach/mem_map.h index 5078b669431f..5078b669431f 100644 --- a/include/asm-blackfin/mach-bf537/mem_map.h +++ b/arch/blackfin/mach-bf537/include/mach/mem_map.h diff --git a/include/asm-blackfin/mach-bf537/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h index 78fee6e0f237..78fee6e0f237 100644 --- a/include/asm-blackfin/mach-bf537/portmux.h +++ b/arch/blackfin/mach-bf537/include/mach/portmux.h diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 58abbed0a225..ce934ee174e0 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c @@ -45,7 +45,7 @@ #include <asm/gpio.h> #include <asm/nand.h> #include <asm/portmux.h> -#include <asm/mach/bf54x_keys.h> +#include <mach/bf54x_keys.h> #include <asm/dpmc.h> #include <linux/input.h> #include <linux/spi/ad7877.h> @@ -61,7 +61,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF548"; #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) -#include <asm/mach/bf54x-lq043.h> +#include <mach/bf54x-lq043.h> static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { .width = 480, diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 0d6333ada1d9..39357693046d 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c @@ -48,7 +48,7 @@ #include <asm/nand.h> #include <asm/dpmc.h> #include <asm/portmux.h> -#include <asm/mach/bf54x_keys.h> +#include <mach/bf54x_keys.h> #include <linux/input.h> #include <linux/spi/ad7877.h> @@ -106,7 +106,7 @@ arch_initcall(bfin_isp1761_init); #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) -#include <asm/mach/bf54x-lq043.h> +#include <mach/bf54x-lq043.h> static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { .width = 480, diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S index e3000f70a26e..4d5cfeacb123 100644 --- a/arch/blackfin/mach-bf548/head.S +++ b/arch/blackfin/mach-bf548/head.S @@ -31,8 +31,8 @@ #include <linux/init.h> #include <asm/blackfin.h> #ifdef CONFIG_BFIN_KERNEL_CLOCK -#include <asm/mach-common/clocks.h> -#include <asm/mach/mem_init.h> +#include <asm/clocks.h> +#include <mach/mem_init.h> #endif .section .l1.text diff --git a/include/asm-blackfin/mach-bf548/anomaly.h b/arch/blackfin/mach-bf548/include/mach/anomaly.h index 3ad59655881a..3ad59655881a 100644 --- a/include/asm-blackfin/mach-bf548/anomaly.h +++ b/arch/blackfin/mach-bf548/include/mach/anomaly.h diff --git a/include/asm-blackfin/mach-bf548/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h index e748588e8930..e748588e8930 100644 --- a/include/asm-blackfin/mach-bf548/bf548.h +++ b/arch/blackfin/mach-bf548/include/mach/bf548.h diff --git a/include/asm-blackfin/mach-bf548/bf54x-lq043.h b/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h index 9c7ca62a45eb..9c7ca62a45eb 100644 --- a/include/asm-blackfin/mach-bf548/bf54x-lq043.h +++ b/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h diff --git a/include/asm-blackfin/mach-bf548/bf54x_keys.h b/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h index 1fb4ec77cc25..1fb4ec77cc25 100644 --- a/include/asm-blackfin/mach-bf548/bf54x_keys.h +++ b/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h diff --git a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h index 5e29446a8e03..5e29446a8e03 100644 --- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h diff --git a/include/asm-blackfin/mach-bf548/bfin_sir.h b/arch/blackfin/mach-bf548/include/mach/bfin_sir.h index c41f9cf00268..c41f9cf00268 100644 --- a/include/asm-blackfin/mach-bf548/bfin_sir.h +++ b/arch/blackfin/mach-bf548/include/mach/bfin_sir.h diff --git a/include/asm-blackfin/mach-bf548/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h index d6ee74ac0460..d6ee74ac0460 100644 --- a/include/asm-blackfin/mach-bf548/blackfin.h +++ b/arch/blackfin/mach-bf548/include/mach/blackfin.h diff --git a/include/asm-blackfin/mach-bf548/cdefBF542.h b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h index 60b9f77576f1..07aefb9ed79b 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h @@ -35,7 +35,7 @@ #include "defBF542.h" /* include core sbfin_read_()ecific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ diff --git a/include/asm-blackfin/mach-bf548/cdefBF544.h b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h index ea9b4ab496f3..431a69278991 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h @@ -35,7 +35,7 @@ #include "defBF544.h" /* include core sbfin_read_()ecific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ diff --git a/include/asm-blackfin/mach-bf548/cdefBF547.h b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h index ba716277c00d..93376e90dfc5 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h @@ -35,7 +35,7 @@ #include "defBF548.h" /* include core sbfin_read_()ecific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ diff --git a/include/asm-blackfin/mach-bf548/cdefBF548.h b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h index ae971ebff6a0..9cd74384136f 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h @@ -35,7 +35,7 @@ #include "defBF548.h" /* include core sbfin_read_()ecific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ diff --git a/include/asm-blackfin/mach-bf548/cdefBF549.h b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h index 92d07d961999..ead360b69dea 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h @@ -35,7 +35,7 @@ #include "defBF549.h" /* include core sbfin_read_()ecific register pointer definitions */ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ diff --git a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h index 57ac8cb9b1f6..57ac8cb9b1f6 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h diff --git a/include/asm-blackfin/mach-bf548/defBF542.h b/arch/blackfin/mach-bf548/include/mach/defBF542.h index a7c809f29ede..b1316541b8d6 100644 --- a/include/asm-blackfin/mach-bf548/defBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF542.h @@ -32,7 +32,7 @@ #define _DEF_BF542_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ diff --git a/include/asm-blackfin/mach-bf548/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h index b8b9870e2697..c2c785bdc5fc 100644 --- a/include/asm-blackfin/mach-bf548/defBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h @@ -32,7 +32,7 @@ #define _DEF_BF544_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ diff --git a/include/asm-blackfin/mach-bf548/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h index 3a3a18ebb10e..661f0d877bd1 100644 --- a/include/asm-blackfin/mach-bf548/defBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h @@ -32,7 +32,7 @@ #define _DEF_BF548_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ diff --git a/include/asm-blackfin/mach-bf548/defBF548.h b/arch/blackfin/mach-bf548/include/mach/defBF548.h index 1d7c96edb038..85d4bade911d 100644 --- a/include/asm-blackfin/mach-bf548/defBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF548.h @@ -32,7 +32,7 @@ #define _DEF_BF548_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ diff --git a/include/asm-blackfin/mach-bf548/defBF549.h b/arch/blackfin/mach-bf548/include/mach/defBF549.h index fcb72b41e007..096734541644 100644 --- a/include/asm-blackfin/mach-bf548/defBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF549.h @@ -32,7 +32,7 @@ #define _DEF_BF549_H /* Include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ diff --git a/include/asm-blackfin/mach-bf548/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h index e022e896cb18..e022e896cb18 100644 --- a/include/asm-blackfin/mach-bf548/defBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h diff --git a/include/asm-blackfin/mach-bf548/dma.h b/arch/blackfin/mach-bf548/include/mach/dma.h index 36a2ef7e7849..36a2ef7e7849 100644 --- a/include/asm-blackfin/mach-bf548/dma.h +++ b/arch/blackfin/mach-bf548/include/mach/dma.h diff --git a/include/asm-blackfin/mach-bf548/gpio.h b/arch/blackfin/mach-bf548/include/mach/gpio.h index bba82dc75f16..bba82dc75f16 100644 --- a/include/asm-blackfin/mach-bf548/gpio.h +++ b/arch/blackfin/mach-bf548/include/mach/gpio.h diff --git a/include/asm-blackfin/mach-bf548/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h index ad380d1f5872..ad380d1f5872 100644 --- a/include/asm-blackfin/mach-bf548/irq.h +++ b/arch/blackfin/mach-bf548/include/mach/irq.h diff --git a/include/asm-blackfin/mach-bf548/mem_init.h b/arch/blackfin/mach-bf548/include/mach/mem_init.h index ab0b863eee66..ab0b863eee66 100644 --- a/include/asm-blackfin/mach-bf548/mem_init.h +++ b/arch/blackfin/mach-bf548/include/mach/mem_init.h diff --git a/include/asm-blackfin/mach-bf548/mem_map.h b/arch/blackfin/mach-bf548/include/mach/mem_map.h index f99f47bc3a07..f99f47bc3a07 100644 --- a/include/asm-blackfin/mach-bf548/mem_map.h +++ b/arch/blackfin/mach-bf548/include/mach/mem_map.h diff --git a/include/asm-blackfin/mach-bf548/portmux.h b/arch/blackfin/mach-bf548/include/mach/portmux.h index 8177a567dcdb..8177a567dcdb 100644 --- a/include/asm-blackfin/mach-bf548/portmux.h +++ b/arch/blackfin/mach-bf548/include/mach/portmux.h diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S index c7a81e34703d..75ea6a905829 100644 --- a/arch/blackfin/mach-bf561/head.S +++ b/arch/blackfin/mach-bf561/head.S @@ -31,8 +31,8 @@ #include <linux/init.h> #include <asm/blackfin.h> #ifdef CONFIG_BFIN_KERNEL_CLOCK -#include <asm/mach-common/clocks.h> -#include <asm/mach/mem_init.h> +#include <asm/clocks.h> +#include <mach/mem_init.h> #endif .section .l1.text diff --git a/include/asm-blackfin/mach-bf561/anomaly.h b/arch/blackfin/mach-bf561/include/mach/anomaly.h index 5c5d7d7d695f..5c5d7d7d695f 100644 --- a/include/asm-blackfin/mach-bf561/anomaly.h +++ b/arch/blackfin/mach-bf561/include/mach/anomaly.h diff --git a/include/asm-blackfin/mach-bf561/bf561.h b/arch/blackfin/mach-bf561/include/mach/bf561.h index 3ef9e5f36136..3ef9e5f36136 100644 --- a/include/asm-blackfin/mach-bf561/bf561.h +++ b/arch/blackfin/mach-bf561/include/mach/bf561.h diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h index 8aa02780e642..8aa02780e642 100644 --- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h diff --git a/include/asm-blackfin/mach-bf561/bfin_sir.h b/arch/blackfin/mach-bf561/include/mach/bfin_sir.h index 9bb87e9e2e9b..9bb87e9e2e9b 100644 --- a/include/asm-blackfin/mach-bf561/bfin_sir.h +++ b/arch/blackfin/mach-bf561/include/mach/bfin_sir.h diff --git a/include/asm-blackfin/mach-bf561/blackfin.h b/arch/blackfin/mach-bf561/include/mach/blackfin.h index 0ea8666e6764..0ea8666e6764 100644 --- a/include/asm-blackfin/mach-bf561/blackfin.h +++ b/arch/blackfin/mach-bf561/include/mach/blackfin.h diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h index b07ffccd66dd..c14d63402e70 100644 --- a/include/asm-blackfin/mach-bf561/cdefBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h @@ -37,7 +37,7 @@ #include "defBF561.h" /*include core specific register pointer definitions*/ -#include <asm/mach-common/cdef_LPBlackfin.h> +#include <asm/cdef_LPBlackfin.h> #include <asm/system.h> diff --git a/include/asm-blackfin/mach-bf561/defBF561.h b/arch/blackfin/mach-bf561/include/mach/defBF561.h index 1ab50e906fe7..4eca2026bb92 100644 --- a/include/asm-blackfin/mach-bf561/defBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/defBF561.h @@ -37,7 +37,7 @@ #endif */ /* include all Core registers and bit definitions */ -#include <asm/mach-common/def_LPBlackfin.h> +#include <asm/def_LPBlackfin.h> /*********************************************************************************** */ /* System MMR Register Map */ diff --git a/include/asm-blackfin/mach-bf561/dma.h b/arch/blackfin/mach-bf561/include/mach/dma.h index 8bc46cd89a02..8bc46cd89a02 100644 --- a/include/asm-blackfin/mach-bf561/dma.h +++ b/arch/blackfin/mach-bf561/include/mach/dma.h diff --git a/include/asm-blackfin/mach-bf561/irq.h b/arch/blackfin/mach-bf561/include/mach/irq.h index 6698389c5564..6698389c5564 100644 --- a/include/asm-blackfin/mach-bf561/irq.h +++ b/arch/blackfin/mach-bf561/include/mach/irq.h diff --git a/include/asm-blackfin/mach-bf561/mem_init.h b/arch/blackfin/mach-bf561/include/mach/mem_init.h index e163260bca18..e163260bca18 100644 --- a/include/asm-blackfin/mach-bf561/mem_init.h +++ b/arch/blackfin/mach-bf561/include/mach/mem_init.h diff --git a/include/asm-blackfin/mach-bf561/mem_map.h b/arch/blackfin/mach-bf561/include/mach/mem_map.h index c26d8486cc4b..c26d8486cc4b 100644 --- a/include/asm-blackfin/mach-bf561/mem_map.h +++ b/arch/blackfin/mach-bf561/include/mach/mem_map.h diff --git a/include/asm-blackfin/mach-bf561/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h index a6ee8206efb6..a6ee8206efb6 100644 --- a/include/asm-blackfin/mach-bf561/portmux.h +++ b/arch/blackfin/mach-bf561/include/mach/portmux.h diff --git a/arch/blackfin/mach-common/arch_checks.c b/arch/blackfin/mach-common/arch_checks.c index 5986758b2752..98133b968f7b 100644 --- a/arch/blackfin/mach-common/arch_checks.c +++ b/arch/blackfin/mach-common/arch_checks.c @@ -28,8 +28,8 @@ */ #include <asm/fixed_code.h> -#include <asm/mach/anomaly.h> -#include <asm/mach-common/clocks.h> +#include <mach/anomaly.h> +#include <asm/clocks.h> #ifdef CONFIG_BFIN_KERNEL_CLOCK diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S index 838b0b2ce9a5..ad5431e2cd05 100644 --- a/arch/blackfin/mach-common/dpmc_modes.S +++ b/arch/blackfin/mach-common/dpmc_modes.S @@ -6,7 +6,7 @@ #include <linux/linkage.h> #include <asm/blackfin.h> -#include <asm/mach/irq.h> +#include <mach/irq.h> #include <asm/dpmc.h> .section .l1.text diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 117c01c2c6b0..847c172a99eb 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S @@ -43,7 +43,7 @@ #include <asm/asm-offsets.h> #include <asm/trace.h> -#include <asm/mach-common/context.S> +#include <asm/context.S> #if defined(CONFIG_BFIN_SCRATCH_REG_RETN) # define EX_SCRATCH_REG RETN diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S index 7f752c87fe46..b27e59d32401 100644 --- a/arch/blackfin/mach-common/interrupt.S +++ b/arch/blackfin/mach-common/interrupt.S @@ -29,7 +29,7 @@ */ #include <asm/blackfin.h> -#include <asm/mach/irq.h> +#include <mach/irq.h> #include <linux/linkage.h> #include <asm/entry.h> #include <asm/asm-offsets.h> @@ -37,7 +37,7 @@ #include <asm/traps.h> #include <asm/thread_info.h> -#include <asm/mach-common/context.S> +#include <asm/context.S> .extern _ret_from_exception diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 62f8883a5c27..5fa536727c61 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -216,7 +216,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state) wakeup |= KPADWE; break; #endif -#ifdef IRQ_CNT +#ifdef CONFIG_BF54x case IRQ_CNT: wakeup |= ROTWE; break; @@ -983,7 +983,7 @@ int __init init_arch_irq(void) local_irq_disable(); -#if defined(CONFIG_BF527) || defined(CONFIG_BF536) || defined(CONFIG_BF537) +#if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) /* Clear EMAC Interrupt Status bits so we can demux it later */ bfin_write_EMAC_SYSTAT(-1); #endif diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/blackfin_sram.c index 9d2be43ac3da..4f5e887a0d96 100644 --- a/arch/blackfin/mm/blackfin_sram.c +++ b/arch/blackfin/mm/blackfin_sram.c @@ -335,7 +335,7 @@ static int _sram_free(const void *addr, plast->size += pavail->size; kmem_cache_free(sram_piece_cache, pavail); } else { - pavail->next = plast; + pavail->next = plast->next; plast->next = pavail; plast = pavail; } @@ -379,7 +379,7 @@ EXPORT_SYMBOL(sram_free); void *l1_data_A_sram_alloc(size_t size) { - unsigned flags; + unsigned long flags; void *addr = NULL; /* add mutex operation */ @@ -402,7 +402,7 @@ EXPORT_SYMBOL(l1_data_A_sram_alloc); int l1_data_A_sram_free(const void *addr) { - unsigned flags; + unsigned long flags; int ret; /* add mutex operation */ @@ -425,7 +425,7 @@ EXPORT_SYMBOL(l1_data_A_sram_free); void *l1_data_B_sram_alloc(size_t size) { #if L1_DATA_B_LENGTH != 0 - unsigned flags; + unsigned long flags; void *addr; /* add mutex operation */ @@ -450,7 +450,7 @@ EXPORT_SYMBOL(l1_data_B_sram_alloc); int l1_data_B_sram_free(const void *addr) { #if L1_DATA_B_LENGTH != 0 - unsigned flags; + unsigned long flags; int ret; /* add mutex operation */ @@ -504,7 +504,7 @@ EXPORT_SYMBOL(l1_data_sram_free); void *l1_inst_sram_alloc(size_t size) { #if L1_CODE_LENGTH != 0 - unsigned flags; + unsigned long flags; void *addr; /* add mutex operation */ @@ -529,7 +529,7 @@ EXPORT_SYMBOL(l1_inst_sram_alloc); int l1_inst_sram_free(const void *addr) { #if L1_CODE_LENGTH != 0 - unsigned flags; + unsigned long flags; int ret; /* add mutex operation */ @@ -551,7 +551,7 @@ EXPORT_SYMBOL(l1_inst_sram_free); /* L1 Scratchpad memory allocate function */ void *l1sram_alloc(size_t size) { - unsigned flags; + unsigned long flags; void *addr; /* add mutex operation */ @@ -569,7 +569,7 @@ void *l1sram_alloc(size_t size) /* L1 Scratchpad memory allocate function */ void *l1sram_alloc_max(size_t *psize) { - unsigned flags; + unsigned long flags; void *addr; /* add mutex operation */ @@ -587,7 +587,7 @@ void *l1sram_alloc_max(size_t *psize) /* L1 Scratchpad memory free function */ int l1sram_free(const void *addr) { - unsigned flags; + unsigned long flags; int ret; /* add mutex operation */ @@ -605,7 +605,7 @@ int l1sram_free(const void *addr) void *l2_sram_alloc(size_t size) { #if L2_LENGTH != 0 - unsigned flags; + unsigned long flags; void *addr; /* add mutex operation */ @@ -641,7 +641,7 @@ EXPORT_SYMBOL(l2_sram_zalloc); int l2_sram_free(const void *addr) { #if L2_LENGTH != 0 - unsigned flags; + unsigned long flags; int ret; /* add mutex operation */ diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 6f227d3dbda1..e348cfccc17a 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c @@ -43,7 +43,7 @@ #include <linux/input.h> #include <asm/portmux.h> -#include <asm/mach/bf54x_keys.h> +#include <mach/bf54x_keys.h> #define DRV_NAME "bf54x-keys" #define TIME_SCALE 100 /* 100 ns */ diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index efcd44344fb1..4a0d30bed9f1 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c @@ -28,7 +28,7 @@ #endif #include <asm/gpio.h> -#include <asm/mach/bfin_serial_5xx.h> +#include <mach/bfin_serial_5xx.h> #ifdef CONFIG_SERIAL_BFIN_DMA #include <linux/dma-mapping.h> diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 6d5aa806777e..7644ed249564 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c @@ -58,7 +58,7 @@ #include <asm/gpio.h> #include <asm/portmux.h> -#include <asm/mach/bf54x-lq043.h> +#include <mach/bf54x-lq043.h> #define NO_BL_SUPPORT |