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

…/git/cooloney/blackfin-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE Blackfin arch: sram: use 'unsigned long' for irqflags Blackfin arch: let PCI depend on BROKEN Blackfin arch: move include/asm-blackfin header files to arch/blackfin Blackfin arch: fix bug - MPU crashes under stress Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board. Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
mariux64 · Aug 28, 2008 · 604a278 · 604a278
2 parents 66833d5 + d310fb4
commit 604a278
Show file tree

Hide file tree

Showing 217 changed files with 200 additions and 197 deletions.
diff --git 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
@@ -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 → arch/blackfin/include/asm/.gitignore b/include/asm-blackfin/.gitignore → arch/blackfin/include/asm/.gitignore
diff --git a/include/asm-blackfin/Kbuild → arch/blackfin/include/asm/Kbuild b/include/asm-blackfin/Kbuild → arch/blackfin/include/asm/Kbuild
diff --git a/include/asm-blackfin/a.out.h → arch/blackfin/include/asm/a.out.h b/include/asm-blackfin/a.out.h → arch/blackfin/include/asm/a.out.h
diff --git a/include/asm-blackfin/atomic.h → arch/blackfin/include/asm/atomic.h b/include/asm-blackfin/atomic.h → arch/blackfin/include/asm/atomic.h
diff --git a/include/asm-blackfin/auxvec.h → arch/blackfin/include/asm/auxvec.h b/include/asm-blackfin/auxvec.h → arch/blackfin/include/asm/auxvec.h
diff --git a/include/asm-blackfin/bfin-global.h → arch/blackfin/include/asm/bfin-global.h b/include/asm-blackfin/bfin-global.h → arch/blackfin/include/asm/bfin-global.h
diff --git a/include/asm-blackfin/bfin5xx_spi.h → arch/blackfin/include/asm/bfin5xx_spi.h b/include/asm-blackfin/bfin5xx_spi.h → arch/blackfin/include/asm/bfin5xx_spi.h
diff --git a/include/asm-blackfin/bfin_simple_timer.h → .../blackfin/include/asm/bfin_simple_timer.h b/include/asm-blackfin/bfin_simple_timer.h → .../blackfin/include/asm/bfin_simple_timer.h
diff --git a/include/asm-blackfin/bfin_sport.h → arch/blackfin/include/asm/bfin_sport.h b/include/asm-blackfin/bfin_sport.h → arch/blackfin/include/asm/bfin_sport.h
diff --git a/include/asm-blackfin/bitops.h → arch/blackfin/include/asm/bitops.h b/include/asm-blackfin/bitops.h → arch/blackfin/include/asm/bitops.h
diff --git a/include/asm-blackfin/blackfin.h → arch/blackfin/include/asm/blackfin.h b/include/asm-blackfin/blackfin.h → 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 → arch/blackfin/include/asm/bug.h b/include/asm-blackfin/bug.h → arch/blackfin/include/asm/bug.h
diff --git a/include/asm-blackfin/bugs.h → arch/blackfin/include/asm/bugs.h b/include/asm-blackfin/bugs.h → arch/blackfin/include/asm/bugs.h
diff --git a/include/asm-blackfin/byteorder.h → arch/blackfin/include/asm/byteorder.h b/include/asm-blackfin/byteorder.h → arch/blackfin/include/asm/byteorder.h
diff --git a/include/asm-blackfin/cache.h → arch/blackfin/include/asm/cache.h b/include/asm-blackfin/cache.h → arch/blackfin/include/asm/cache.h
diff --git a/include/asm-blackfin/cacheflush.h → arch/blackfin/include/asm/cacheflush.h b/include/asm-blackfin/cacheflush.h → arch/blackfin/include/asm/cacheflush.h
diff --git a/...sm-blackfin/mach-common/cdef_LPBlackfin.h → arch/blackfin/include/asm/cdef_LPBlackfin.h b/...sm-blackfin/mach-common/cdef_LPBlackfin.h → 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 → arch/blackfin/include/asm/checksum.h b/include/asm-blackfin/checksum.h → arch/blackfin/include/asm/checksum.h
diff --git a/include/asm-blackfin/mach-common/clocks.h → arch/blackfin/include/asm/clocks.h b/include/asm-blackfin/mach-common/clocks.h → arch/blackfin/include/asm/clocks.h
diff --git a/include/asm-blackfin/mach-common/context.S → arch/blackfin/include/asm/context.S b/include/asm-blackfin/mach-common/context.S → arch/blackfin/include/asm/context.S
diff --git a/include/asm-blackfin/cplb-mpu.h → arch/blackfin/include/asm/cplb-mpu.h b/include/asm-blackfin/cplb-mpu.h → arch/blackfin/include/asm/cplb-mpu.h
diff --git a/include/asm-blackfin/cplb.h → arch/blackfin/include/asm/cplb.h b/include/asm-blackfin/cplb.h → 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 → arch/blackfin/include/asm/cplbinit.h b/include/asm-blackfin/cplbinit.h → arch/blackfin/include/asm/cplbinit.h
diff --git a/include/asm-blackfin/cpumask.h → arch/blackfin/include/asm/cpumask.h b/include/asm-blackfin/cpumask.h → arch/blackfin/include/asm/cpumask.h
diff --git a/include/asm-blackfin/cputime.h → arch/blackfin/include/asm/cputime.h b/include/asm-blackfin/cputime.h → arch/blackfin/include/asm/cputime.h
diff --git a/include/asm-blackfin/current.h → arch/blackfin/include/asm/current.h b/include/asm-blackfin/current.h → arch/blackfin/include/asm/current.h
diff --git a/...asm-blackfin/mach-common/def_LPBlackfin.h → arch/blackfin/include/asm/def_LPBlackfin.h b/...asm-blackfin/mach-common/def_LPBlackfin.h → 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 → arch/blackfin/include/asm/delay.h b/include/asm-blackfin/delay.h → 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 → arch/blackfin/include/asm/device.h b/include/asm-blackfin/device.h → arch/blackfin/include/asm/device.h
diff --git a/include/asm-blackfin/div64.h → arch/blackfin/include/asm/div64.h b/include/asm-blackfin/div64.h → arch/blackfin/include/asm/div64.h
diff --git a/include/asm-blackfin/dma-mapping.h → arch/blackfin/include/asm/dma-mapping.h b/include/asm-blackfin/dma-mapping.h → arch/blackfin/include/asm/dma-mapping.h
diff --git a/include/asm-blackfin/dma.h → arch/blackfin/include/asm/dma.h b/include/asm-blackfin/dma.h → 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 → arch/blackfin/include/asm/dpmc.h b/include/asm-blackfin/dpmc.h → arch/blackfin/include/asm/dpmc.h
diff --git a/include/asm-blackfin/early_printk.h → arch/blackfin/include/asm/early_printk.h b/include/asm-blackfin/early_printk.h → arch/blackfin/include/asm/early_printk.h
diff --git a/include/asm-blackfin/elf.h → arch/blackfin/include/asm/elf.h b/include/asm-blackfin/elf.h → arch/blackfin/include/asm/elf.h
diff --git a/include/asm-blackfin/emergency-restart.h → .../blackfin/include/asm/emergency-restart.h b/include/asm-blackfin/emergency-restart.h → .../blackfin/include/asm/emergency-restart.h
diff --git a/include/asm-blackfin/entry.h → arch/blackfin/include/asm/entry.h b/include/asm-blackfin/entry.h → arch/blackfin/include/asm/entry.h
diff --git a/include/asm-blackfin/errno.h → arch/blackfin/include/asm/errno.h b/include/asm-blackfin/errno.h → arch/blackfin/include/asm/errno.h
diff --git a/include/asm-blackfin/fb.h → arch/blackfin/include/asm/fb.h b/include/asm-blackfin/fb.h → arch/blackfin/include/asm/fb.h
diff --git a/include/asm-blackfin/fcntl.h → arch/blackfin/include/asm/fcntl.h b/include/asm-blackfin/fcntl.h → arch/blackfin/include/asm/fcntl.h
diff --git a/include/asm-blackfin/fixed_code.h → arch/blackfin/include/asm/fixed_code.h b/include/asm-blackfin/fixed_code.h → arch/blackfin/include/asm/fixed_code.h
diff --git a/include/asm-blackfin/flat.h → arch/blackfin/include/asm/flat.h b/include/asm-blackfin/flat.h → arch/blackfin/include/asm/flat.h
diff --git a/include/asm-blackfin/futex.h → arch/blackfin/include/asm/futex.h b/include/asm-blackfin/futex.h → arch/blackfin/include/asm/futex.h
diff --git a/include/asm-blackfin/gpio.h → arch/blackfin/include/asm/gpio.h b/include/asm-blackfin/gpio.h → 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 → arch/blackfin/include/asm/gptimers.h b/include/asm-blackfin/gptimers.h → arch/blackfin/include/asm/gptimers.h
diff --git a/include/asm-blackfin/hardirq.h → arch/blackfin/include/asm/hardirq.h b/include/asm-blackfin/hardirq.h → arch/blackfin/include/asm/hardirq.h
diff --git a/include/asm-blackfin/hw_irq.h → arch/blackfin/include/asm/hw_irq.h b/include/asm-blackfin/hw_irq.h → arch/blackfin/include/asm/hw_irq.h
diff --git a/include/asm-blackfin/io.h → arch/blackfin/include/asm/io.h b/include/asm-blackfin/io.h → arch/blackfin/include/asm/io.h
diff --git a/include/asm-blackfin/ioctl.h → arch/blackfin/include/asm/ioctl.h b/include/asm-blackfin/ioctl.h → arch/blackfin/include/asm/ioctl.h
diff --git a/include/asm-blackfin/ioctls.h → arch/blackfin/include/asm/ioctls.h b/include/asm-blackfin/ioctls.h → arch/blackfin/include/asm/ioctls.h
diff --git a/include/asm-blackfin/ipcbuf.h → arch/blackfin/include/asm/ipcbuf.h b/include/asm-blackfin/ipcbuf.h → arch/blackfin/include/asm/ipcbuf.h
diff --git a/include/asm-blackfin/irq.h → arch/blackfin/include/asm/irq.h b/include/asm-blackfin/irq.h → 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 → arch/blackfin/include/asm/irq_handler.h b/include/asm-blackfin/irq_handler.h → arch/blackfin/include/asm/irq_handler.h
diff --git a/include/asm-blackfin/irq_regs.h → arch/blackfin/include/asm/irq_regs.h b/include/asm-blackfin/irq_regs.h → arch/blackfin/include/asm/irq_regs.h
diff --git a/include/asm-blackfin/kdebug.h → arch/blackfin/include/asm/kdebug.h b/include/asm-blackfin/kdebug.h → arch/blackfin/include/asm/kdebug.h
diff --git a/include/asm-blackfin/kgdb.h → arch/blackfin/include/asm/kgdb.h b/include/asm-blackfin/kgdb.h → arch/blackfin/include/asm/kgdb.h
diff --git a/include/asm-blackfin/kmap_types.h → arch/blackfin/include/asm/kmap_types.h b/include/asm-blackfin/kmap_types.h → arch/blackfin/include/asm/kmap_types.h
diff --git a/include/asm-blackfin/l1layout.h → arch/blackfin/include/asm/l1layout.h b/include/asm-blackfin/l1layout.h → arch/blackfin/include/asm/l1layout.h
diff --git a/include/asm-blackfin/linkage.h → arch/blackfin/include/asm/linkage.h b/include/asm-blackfin/linkage.h → arch/blackfin/include/asm/linkage.h
diff --git a/include/asm-blackfin/local.h → arch/blackfin/include/asm/local.h b/include/asm-blackfin/local.h → arch/blackfin/include/asm/local.h
diff --git a/include/asm-blackfin/mem_map.h → arch/blackfin/include/asm/mem_map.h b/include/asm-blackfin/mem_map.h → 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 → arch/blackfin/include/asm/mman.h b/include/asm-blackfin/mman.h → arch/blackfin/include/asm/mman.h
diff --git a/include/asm-blackfin/mmu.h → arch/blackfin/include/asm/mmu.h b/include/asm-blackfin/mmu.h → arch/blackfin/include/asm/mmu.h
diff --git a/include/asm-blackfin/mmu_context.h → arch/blackfin/include/asm/mmu_context.h b/include/asm-blackfin/mmu_context.h → 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 → arch/blackfin/include/asm/module.h b/include/asm-blackfin/module.h → arch/blackfin/include/asm/module.h
diff --git a/include/asm-blackfin/msgbuf.h → arch/blackfin/include/asm/msgbuf.h b/include/asm-blackfin/msgbuf.h → arch/blackfin/include/asm/msgbuf.h
diff --git a/include/asm-blackfin/mutex.h → arch/blackfin/include/asm/mutex.h b/include/asm-blackfin/mutex.h → arch/blackfin/include/asm/mutex.h
diff --git a/include/asm-blackfin/nand.h → arch/blackfin/include/asm/nand.h b/include/asm-blackfin/nand.h → arch/blackfin/include/asm/nand.h
diff --git a/include/asm-blackfin/page.h → arch/blackfin/include/asm/page.h b/include/asm-blackfin/page.h → arch/blackfin/include/asm/page.h
diff --git a/include/asm-blackfin/page_offset.h → arch/blackfin/include/asm/page_offset.h b/include/asm-blackfin/page_offset.h → arch/blackfin/include/asm/page_offset.h
diff --git a/include/asm-blackfin/param.h → arch/blackfin/include/asm/param.h b/include/asm-blackfin/param.h → arch/blackfin/include/asm/param.h
diff --git a/include/asm-blackfin/pci.h → arch/blackfin/include/asm/pci.h b/include/asm-blackfin/pci.h → arch/blackfin/include/asm/pci.h
diff --git a/include/asm-blackfin/percpu.h → arch/blackfin/include/asm/percpu.h b/include/asm-blackfin/percpu.h → arch/blackfin/include/asm/percpu.h
diff --git a/include/asm-blackfin/pgalloc.h → arch/blackfin/include/asm/pgalloc.h b/include/asm-blackfin/pgalloc.h → arch/blackfin/include/asm/pgalloc.h
diff --git a/include/asm-blackfin/pgtable.h → arch/blackfin/include/asm/pgtable.h b/include/asm-blackfin/pgtable.h → 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 → arch/blackfin/include/asm/poll.h b/include/asm-blackfin/poll.h → arch/blackfin/include/asm/poll.h
diff --git a/include/asm-blackfin/portmux.h → arch/blackfin/include/asm/portmux.h b/include/asm-blackfin/portmux.h → 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 → arch/blackfin/include/asm/posix_types.h b/include/asm-blackfin/posix_types.h → arch/blackfin/include/asm/posix_types.h
diff --git a/include/asm-blackfin/processor.h → arch/blackfin/include/asm/processor.h b/include/asm-blackfin/processor.h → arch/blackfin/include/asm/processor.h
diff --git a/include/asm-blackfin/ptrace.h → arch/blackfin/include/asm/ptrace.h b/include/asm-blackfin/ptrace.h → arch/blackfin/include/asm/ptrace.h
diff --git a/include/asm-blackfin/reboot.h → arch/blackfin/include/asm/reboot.h b/include/asm-blackfin/reboot.h → arch/blackfin/include/asm/reboot.h
diff --git a/include/asm-blackfin/resource.h → arch/blackfin/include/asm/resource.h b/include/asm-blackfin/resource.h → arch/blackfin/include/asm/resource.h
diff --git a/include/asm-blackfin/scatterlist.h → arch/blackfin/include/asm/scatterlist.h b/include/asm-blackfin/scatterlist.h → arch/blackfin/include/asm/scatterlist.h
diff --git a/include/asm-blackfin/sections.h → arch/blackfin/include/asm/sections.h b/include/asm-blackfin/sections.h → arch/blackfin/include/asm/sections.h
diff --git a/include/asm-blackfin/segment.h → arch/blackfin/include/asm/segment.h b/include/asm-blackfin/segment.h → arch/blackfin/include/asm/segment.h
diff --git a/include/asm-blackfin/sembuf.h → arch/blackfin/include/asm/sembuf.h b/include/asm-blackfin/sembuf.h → arch/blackfin/include/asm/sembuf.h
diff --git a/include/asm-blackfin/serial.h → arch/blackfin/include/asm/serial.h b/include/asm-blackfin/serial.h → arch/blackfin/include/asm/serial.h
diff --git a/include/asm-blackfin/setup.h → arch/blackfin/include/asm/setup.h b/include/asm-blackfin/setup.h → arch/blackfin/include/asm/setup.h
diff --git a/include/asm-blackfin/shmbuf.h → arch/blackfin/include/asm/shmbuf.h b/include/asm-blackfin/shmbuf.h → arch/blackfin/include/asm/shmbuf.h
diff --git a/include/asm-blackfin/shmparam.h → arch/blackfin/include/asm/shmparam.h b/include/asm-blackfin/shmparam.h → arch/blackfin/include/asm/shmparam.h
diff --git a/include/asm-blackfin/sigcontext.h → arch/blackfin/include/asm/sigcontext.h b/include/asm-blackfin/sigcontext.h → arch/blackfin/include/asm/sigcontext.h
diff --git a/include/asm-blackfin/siginfo.h → arch/blackfin/include/asm/siginfo.h b/include/asm-blackfin/siginfo.h → arch/blackfin/include/asm/siginfo.h
diff --git a/include/asm-blackfin/signal.h → arch/blackfin/include/asm/signal.h b/include/asm-blackfin/signal.h → arch/blackfin/include/asm/signal.h
diff --git a/include/asm-blackfin/socket.h → arch/blackfin/include/asm/socket.h b/include/asm-blackfin/socket.h → arch/blackfin/include/asm/socket.h
diff --git a/include/asm-blackfin/sockios.h → arch/blackfin/include/asm/sockios.h b/include/asm-blackfin/sockios.h → arch/blackfin/include/asm/sockios.h
diff --git a/include/asm-blackfin/spinlock.h → arch/blackfin/include/asm/spinlock.h b/include/asm-blackfin/spinlock.h → arch/blackfin/include/asm/spinlock.h
diff --git a/include/asm-blackfin/stat.h → arch/blackfin/include/asm/stat.h b/include/asm-blackfin/stat.h → arch/blackfin/include/asm/stat.h
diff --git a/include/asm-blackfin/statfs.h → arch/blackfin/include/asm/statfs.h b/include/asm-blackfin/statfs.h → arch/blackfin/include/asm/statfs.h
diff --git a/include/asm-blackfin/string.h → arch/blackfin/include/asm/string.h b/include/asm-blackfin/string.h → arch/blackfin/include/asm/string.h
diff --git a/include/asm-blackfin/system.h → arch/blackfin/include/asm/system.h b/include/asm-blackfin/system.h → 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 → arch/blackfin/include/asm/termbits.h b/include/asm-blackfin/termbits.h → arch/blackfin/include/asm/termbits.h
diff --git a/include/asm-blackfin/termios.h → arch/blackfin/include/asm/termios.h b/include/asm-blackfin/termios.h → arch/blackfin/include/asm/termios.h
diff --git a/include/asm-blackfin/thread_info.h → arch/blackfin/include/asm/thread_info.h b/include/asm-blackfin/thread_info.h → arch/blackfin/include/asm/thread_info.h
diff --git a/include/asm-blackfin/time.h → arch/blackfin/include/asm/time.h b/include/asm-blackfin/time.h → arch/blackfin/include/asm/time.h
diff --git a/include/asm-blackfin/timex.h → arch/blackfin/include/asm/timex.h b/include/asm-blackfin/timex.h → arch/blackfin/include/asm/timex.h
diff --git a/include/asm-blackfin/tlb.h → arch/blackfin/include/asm/tlb.h b/include/asm-blackfin/tlb.h → arch/blackfin/include/asm/tlb.h
diff --git a/include/asm-blackfin/tlbflush.h → arch/blackfin/include/asm/tlbflush.h b/include/asm-blackfin/tlbflush.h → arch/blackfin/include/asm/tlbflush.h
diff --git a/include/asm-blackfin/topology.h → arch/blackfin/include/asm/topology.h b/include/asm-blackfin/topology.h → arch/blackfin/include/asm/topology.h
diff --git a/include/asm-blackfin/trace.h → arch/blackfin/include/asm/trace.h b/include/asm-blackfin/trace.h → arch/blackfin/include/asm/trace.h
diff --git a/include/asm-blackfin/traps.h → arch/blackfin/include/asm/traps.h b/include/asm-blackfin/traps.h → arch/blackfin/include/asm/traps.h
diff --git a/include/asm-blackfin/types.h → arch/blackfin/include/asm/types.h b/include/asm-blackfin/types.h → arch/blackfin/include/asm/types.h
diff --git a/include/asm-blackfin/uaccess.h → arch/blackfin/include/asm/uaccess.h b/include/asm-blackfin/uaccess.h → arch/blackfin/include/asm/uaccess.h
diff --git a/include/asm-blackfin/ucontext.h → arch/blackfin/include/asm/ucontext.h b/include/asm-blackfin/ucontext.h → arch/blackfin/include/asm/ucontext.h
diff --git a/include/asm-blackfin/unaligned.h → arch/blackfin/include/asm/unaligned.h b/include/asm-blackfin/unaligned.h → arch/blackfin/include/asm/unaligned.h
diff --git a/include/asm-blackfin/unistd.h → arch/blackfin/include/asm/unistd.h b/include/asm-blackfin/unistd.h → arch/blackfin/include/asm/unistd.h
diff --git a/include/asm-blackfin/user.h → arch/blackfin/include/asm/user.h b/include/asm-blackfin/user.h → arch/blackfin/include/asm/user.h
diff --git 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
@@ -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 → ...lackfin/mach-bf527/include/mach/anomaly.h b/include/asm-blackfin/mach-bf527/anomaly.h → ...lackfin/mach-bf527/include/mach/anomaly.h
diff --git a/include/asm-blackfin/mach-bf527/bf527.h → .../blackfin/mach-bf527/include/mach/bf527.h b/include/asm-blackfin/mach-bf527/bf527.h → .../blackfin/mach-bf527/include/mach/bf527.h
diff --git a/...asm-blackfin/mach-bf527/bfin_serial_5xx.h → ...mach-bf527/include/mach/bfin_serial_5xx.h b/...asm-blackfin/mach-bf527/bfin_serial_5xx.h → ...mach-bf527/include/mach/bfin_serial_5xx.h
diff --git a/include/asm-blackfin/mach-bf527/bfin_sir.h → ...ackfin/mach-bf527/include/mach/bfin_sir.h b/include/asm-blackfin/mach-bf527/bfin_sir.h → ...ackfin/mach-bf527/include/mach/bfin_sir.h
diff --git a/include/asm-blackfin/mach-bf527/blackfin.h → ...ackfin/mach-bf527/include/mach/blackfin.h b/include/asm-blackfin/mach-bf527/blackfin.h → ...ackfin/mach-bf527/include/mach/blackfin.h
diff --git a/include/asm-blackfin/mach-bf527/cdefBF522.h → ...ckfin/mach-bf527/include/mach/cdefBF522.h b/include/asm-blackfin/mach-bf527/cdefBF522.h → ...ckfin/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 → ...ckfin/mach-bf527/include/mach/cdefBF525.h b/include/asm-blackfin/mach-bf527/cdefBF525.h → ...ckfin/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 → ...ckfin/mach-bf527/include/mach/cdefBF527.h b/include/asm-blackfin/mach-bf527/cdefBF527.h → ...ckfin/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/.../asm-blackfin/mach-bf527/cdefBF52x_base.h → .../mach-bf527/include/mach/cdefBF52x_base.h b/.../asm-blackfin/mach-bf527/cdefBF52x_base.h → .../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 → ...ackfin/mach-bf527/include/mach/defBF522.h b/include/asm-blackfin/mach-bf527/defBF522.h → ...ackfin/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 → ...ackfin/mach-bf527/include/mach/defBF525.h b/include/asm-blackfin/mach-bf527/defBF525.h → ...ackfin/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 → ...ackfin/mach-bf527/include/mach/defBF527.h b/include/asm-blackfin/mach-bf527/defBF527.h → ...ackfin/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 */