[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

152 files changed, 254 insertions, 269 deletions

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 93e3588518..5105d63dec 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -32,6 +32,14 @@ board-$(CONFIG_MACH_EUKREA_CPUIMX27) := eukrea_cpuimx27
 cpu-$(CONFIG_ARM920T)              := arm920t
 cpu-$(CONFIG_ARM926EJS)            := arm926ejs
 
+machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
+
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
+else
+CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
+endif
+
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
@@ -42,25 +50,6 @@ CPPFLAGS += -fdata-sections -ffunction-sections
 LDFLAGS_uboot += -static --gc-sections
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-#	Update machine arch and proc symlinks if something which affects
-#	them changed.  We use .arch to indicate when they were updated
-#	last, otherwise make uses the target directory mtime.
-
-include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-arm
-	$(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch
-else
-	$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
-endif
-	@touch $@
-
 uboot.netx: uboot.bin
 	$(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx		\
 		--sdramctrl=$(CONFIG_NETX_SDRAM_CTRL)			\
@@ -78,7 +67,6 @@ all: $(KBUILD_IMAGE)
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-arm/.arch
 
 # Add architecture specific flags
 ifeq ($(CONFIG_ARMCORTEXA8),y)
@@ -104,4 +92,3 @@ lds-$(CONFIG_GENERIC_LINKER_SCRIPT)   := arch/arm/lib/u-boot.lds
 lds-$(CONFIG_BOARD_LINKER_SCRIPT)     := $(BOARD)/u-boot.lds
 
 CLEAN_FILES    += arch/arm/lib/u-boot.lds
-MRPROPER_FILES += include/asm-arm/arch
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index fff4f800ee..166a7a3e28 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -2,6 +2,6 @@
 #define _ARCH_ARM_GPIO_H
 
 /* not all ARM platforms necessarily support this API ... */
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #endif /* _ARCH_ARM_GPIO_H */
diff --git a/arch/arm/include/asm/hardware.h b/arch/arm/include/asm/hardware.h
index 1fd1a5b650..c71c2aeab2 100644
--- a/arch/arm/include/asm/hardware.h
+++ b/arch/arm/include/asm/hardware.h
@@ -13,6 +13,6 @@
 #ifndef __ASM_HARDWARE_H
 #define __ASM_HARDWARE_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #endif
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 5e321c1e7b..0cfe913f72 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -12,11 +12,11 @@
 #include <common.h>
 #include <asm/armlinux.h>
 #include <asm/hardware.h>
-#include <asm/arch/board.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91sam9260_matrix.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/board.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91sam9260_matrix.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct memory_platform_data sram_pdata = {
 	.name = "sram0",
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 83b733f58b..50a63488f4 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -12,11 +12,11 @@
 #include <common.h>
 #include <asm/armlinux.h>
 #include <asm/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91sam9263_matrix.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91sam9263_matrix.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct memory_platform_data ram_pdata = {
 	.name = "ram0",
diff --git a/arch/arm/mach-at91/clocksource.c b/arch/arm/mach-at91/clocksource.c
index d937e49c38..b5886f938e 100644
--- a/arch/arm/mach-at91/clocksource.c
+++ b/arch/arm/mach-at91/clocksource.c
@@ -33,10 +33,10 @@
 #include <init.h>
 #include <clock.h>
 #include <asm/hardware.h>
-#include <asm/arch/at91_pit.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pit.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/io.h>
 #include <asm/io.h>
 
 uint64_t at91sam9_clocksource_read(void)
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index b479a4f83a..1cafaf7e29 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <gpio.h>
 
 static int gpio_banks;
diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h
index f6ce1f924e..f6ce1f924e 100644
--- a/include/asm-arm/arch-at91/at91_pio.h
+++ b/arch/arm/mach-at91/include/mach/at91_pio.h
diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h
index 94dd242a5f..94dd242a5f 100644
--- a/include/asm-arm/arch-at91/at91_pit.h
+++ b/arch/arm/mach-at91/include/mach/at91_pit.h
diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h
index ed40b8bf6a..ed40b8bf6a 100644
--- a/include/asm-arm/arch-at91/at91_pmc.h
+++ b/arch/arm/mach-at91/include/mach/at91_pmc.h
diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h
index e49caef921..e49caef921 100644
--- a/include/asm-arm/arch-at91/at91_rstc.h
+++ b/arch/arm/mach-at91/include/mach/at91_rstc.h
diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h
index 7e18537cfb..7e18537cfb 100644
--- a/include/asm-arm/arch-at91/at91_wdt.h
+++ b/arch/arm/mach-at91/include/mach/at91_wdt.h
diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 7d166b7a89..7d166b7a89 100644
--- a/include/asm-arm/arch-at91/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
index 020f02ed92..020f02ed92 100644
--- a/include/asm-arm/arch-at91/at91sam9260_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index 7bab1a4b10..7bab1a4b10 100644
--- a/include/asm-arm/arch-at91/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
index 83aaaab773..83aaaab773 100644
--- a/include/asm-arm/arch-at91/at91sam9263_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h
index 56600c741b..58cafd8527 100644
--- a/include/asm-arm/arch-at91/at91sam9_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h
@@ -12,17 +12,17 @@
 #define __ASM_ARCH_AT91SAM9_MATRIX_H
 
 #if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
-#include <asm/arch/at91sam9260_matrix.h>
+#include <mach/at91sam9260_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9261)
-#include <asm/arch/at91sam9261_matrix.h>
+#include <mach/at91sam9261_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9263)
-#include <asm/arch/at91sam9263_matrix.h>
+#include <mach/at91sam9263_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9RL)
-#include <asm/arch/at91sam9rl_matrix.h>
+#include <mach/at91sam9rl_matrix.h>
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <asm/arch/at91cap9_matrix.h>
+#include <mach/at91cap9_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
-#include <asm/arch/at91sam9g45_matrix.h>
+#include <mach/at91sam9g45_matrix.h>
 #else
 #error "Unsupported AT91SAM9/CAP9 processor"
 #endif
diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
index 5af2b54b12..5af2b54b12 100644
--- a/include/asm-arm/arch-at91/at91sam9_sdramc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
index d64511b36d..d64511b36d 100644
--- a/include/asm-arm/arch-at91/at91sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
diff --git a/include/asm-arm/arch-at91/board.h b/arch/arm/mach-at91/include/mach/board.h
index 1ab05ade87..1ab05ade87 100644
--- a/include/asm-arm/arch-at91/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
diff --git a/include/asm-arm/arch-at91/clk.h b/arch/arm/mach-at91/include/mach/clk.h
index f67b4356d9..a9c06836b8 100644
--- a/include/asm-arm/arch-at91/clk.h
+++ b/arch/arm/mach-at91/include/mach/clk.h
@@ -24,7 +24,7 @@
 #ifndef __ASM_ARM_ARCH_CLK_H__
 #define __ASM_ARM_ARCH_CLK_H__
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
 {
diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 1b0238c4cb..76d53ba248 100644
--- a/include/asm-arm/arch-at91/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -15,8 +15,8 @@
 
 #include <asm/io.h>
 #include <asm-generic/errno.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/hardware.h>
+#include <mach/at91_pio.h>
+#include <mach/hardware.h>
 
 #define PIN_BASE		32
 
diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 6f48c3439e..82b574eb0a 100644
--- a/include/asm-arm/arch-at91/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -15,21 +15,21 @@
 #define __ASM_ARCH_HARDWARE_H
 
 #if defined(CONFIG_ARCH_AT91RM9200)
-#include <asm/arch/at91rm9200.h>
+#include <mach/at91rm9200.h>
 #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
-#include <asm/arch/at91sam9260.h>
+#include <mach/at91sam9260.h>
 #elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10)
-#include <asm/arch/at91sam9261.h>
+#include <mach/at91sam9261.h>
 #elif defined(CONFIG_ARCH_AT91SAM9263)
-#include <asm/arch/at91sam9263.h>
+#include <mach/at91sam9263.h>
 #elif defined(CONFIG_ARCH_AT91SAM9RL)
-#include <asm/arch/at91sam9rl.h>
+#include <mach/at91sam9rl.h>
 #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
-#include <asm/arch/at91sam9g45.h>
+#include <mach/at91sam9g45.h>
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <asm/arch/at91cap9.h>
+#include <mach/at91cap9.h>
 #elif defined(CONFIG_ARCH_AT91X40)
-#include <asm/arch/at91x40.h>
+#include <mach/at91x40.h>
 #else
 #error "Unsupported AT91 processor"
 #endif
diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/mach-at91/include/mach/io.h
index f09b2df0e3..f09b2df0e3 100644
--- a/include/asm-arm/arch-at91/io.h
+++ b/arch/arm/mach-at91/include/mach/io.h
diff --git a/include/asm-arm/arch-at91/sam9_smc.h b/arch/arm/mach-at91/include/mach/sam9_smc.h
index bf72cfb345..bf72cfb345 100644
--- a/include/asm-arm/arch-at91/sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/sam9_smc.h
diff --git a/arch/arm/mach-at91/lowlevel_init.S b/arch/arm/mach-at91/lowlevel_init.S
index fa6577a6ab..5bd32e89b0 100644
--- a/arch/arm/mach-at91/lowlevel_init.S
+++ b/arch/arm/mach-at91/lowlevel_init.S
@@ -28,14 +28,14 @@
 
 #include <linux/autoconf.h>
 #include <config.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_wdt.h>
-#include <asm/arch/at91sam9_matrix.h>
-#include <asm/arch/at91sam9_sdramc.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/hardware.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_pio.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_wdt.h>
+#include <mach/at91sam9_matrix.h>
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9_smc.h>
 
 _TEXT_BASE:
 	.word	TEXT_BASE
diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c
index f3f885c72b..3e7de2fc58 100644
--- a/arch/arm/mach-at91/sam9_smc.c
+++ b/arch/arm/mach-at91/sam9_smc.c
@@ -10,11 +10,11 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/io.h>
+#include <mach/hardware.h>
+#include <mach/io.h>
 
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/sam9_smc.h>
+#include <mach/at91sam9_smc.h>
+#include <mach/sam9_smc.h>
 
 void sam9_smc_configure(int cs, struct sam9_smc_config* config)
 {
diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h
index 97d470484c..97d470484c 100644
--- a/include/asm-arm/arch-at91rm9200/AT91RM9200.h
+++ b/arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h
diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/arch/arm/mach-at91rm9200/include/mach/hardware.h
index a84c60a992..a84c60a992 100644
--- a/include/asm-arm/arch-at91rm9200/hardware.h
+++ b/arch/arm/mach-at91rm9200/include/mach/hardware.h
diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c
index 11edfb5ed2..6a8072213c 100644
--- a/arch/arm/mach-imx/clko.c
+++ b/arch/arm/mach-imx/clko.c
@@ -1,8 +1,8 @@
 #include <common.h>
 #include <command.h>
 #include <getopt.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 
 static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index 6c5cc11410..09d43183b8 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -33,8 +33,8 @@
 #include <init.h>
 #include <clock.h>
 #include <notifier.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 
 #define GPT(x) __REG(IMX_TIM1_BASE + (x))
 
diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c
index 49566e41c3..2e1362c965 100644
--- a/arch/arm/mach-imx/gpio.c
+++ b/arch/arm/mach-imx/gpio.c
@@ -24,7 +24,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 void imx_gpio_mode(int gpio_mode)
 {
diff --git a/arch/arm/mach-imx/imx21.c b/arch/arm/mach-imx/imx21.c
index 90b1eef99c..0741f112a3 100644
--- a/arch/arm/mach-imx/imx21.c
+++ b/arch/arm/mach-imx/imx21.c
@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 int imx_silicon_revision(void)
 {
diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c
index 7255a77704..c33346aaf6 100644
--- a/arch/arm/mach-imx/imx27.c
+++ b/arch/arm/mach-imx/imx27.c
@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 int imx_silicon_revision(void)
 {
diff --git a/include/asm-arm/arch-imx/clock-imx1.h b/arch/arm/mach-imx/include/mach/clock-imx1.h
index 8d456b84b2..8d456b84b2 100644
--- a/include/asm-arm/arch-imx/clock-imx1.h
+++ b/arch/arm/mach-imx/include/mach/clock-imx1.h
diff --git a/include/asm-arm/arch-imx/clock.h b/arch/arm/mach-imx/include/mach/clock.h
index c60417922b..c60417922b 100644
--- a/include/asm-arm/arch-imx/clock.h
+++ b/arch/arm/mach-imx/include/mach/clock.h
diff --git a/include/asm-arm/arch-imx/esdctl.h b/arch/arm/mach-imx/include/mach/esdctl.h
index 7f3c66fc62..7f3c66fc62 100644
--- a/include/asm-arm/arch-imx/esdctl.h
+++ b/arch/arm/mach-imx/include/mach/esdctl.h
diff --git a/include/asm-arm/arch-imx/generic.h b/arch/arm/mach-imx/include/mach/generic.h
index 99a53a49a4..99a53a49a4 100644
--- a/include/asm-arm/arch-imx/generic.h
+++ b/arch/arm/mach-imx/include/mach/generic.h
diff --git a/include/asm-arm/arch-imx/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h
index 71298f4e54..71298f4e54 100644
--- a/include/asm-arm/arch-imx/gpio.h
+++ b/arch/arm/mach-imx/include/mach/gpio.h
diff --git a/include/asm-arm/arch-imx/imx-nand.h b/arch/arm/mach-imx/include/mach/imx-nand.h
index 500bb1a9e4..500bb1a9e4 100644
--- a/include/asm-arm/arch-imx/imx-nand.h
+++ b/arch/arm/mach-imx/include/mach/imx-nand.h
diff --git a/include/asm-arm/arch-imx/imx-pll.h b/arch/arm/mach-imx/include/mach/imx-pll.h
index df7e73efea..df7e73efea 100644
--- a/include/asm-arm/arch-imx/imx-pll.h
+++ b/arch/arm/mach-imx/include/mach/imx-pll.h
diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/mach-imx/include/mach/imx-regs.h
index b7a83a4e25..459714e9b4 100644
--- a/include/asm-arm/arch-imx/imx-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx-regs.h
@@ -40,17 +40,17 @@
 #endif
 
 #ifdef CONFIG_ARCH_IMX1
-# include <asm/arch/imx1-regs.h>
+# include <mach/imx1-regs.h>
 #elif defined CONFIG_ARCH_IMX21
-# include <asm/arch/imx21-regs.h>
+# include <mach/imx21-regs.h>
 #elif defined CONFIG_ARCH_IMX27
-# include <asm/arch/imx27-regs.h>
+# include <mach/imx27-regs.h>
 #elif defined CONFIG_ARCH_IMX31
-# include <asm/arch/imx31-regs.h>
+# include <mach/imx31-regs.h>
 #elif defined CONFIG_ARCH_IMX35
-# include <asm/arch/imx35-regs.h>
+# include <mach/imx35-regs.h>
 #elif defined CONFIG_ARCH_IMX25
-# include <asm/arch/imx25-regs.h>
+# include <mach/imx25-regs.h>
 #else
 # error "unknown i.MX soc type"
 #endif
diff --git a/include/asm-arm/arch-imx/imx1-regs.h b/arch/arm/mach-imx/include/mach/imx1-regs.h
index 0d6fd9200e..0d6fd9200e 100644
--- a/include/asm-arm/arch-imx/imx1-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx1-regs.h
diff --git a/include/asm-arm/arch-imx/imx21-regs.h b/arch/arm/mach-imx/include/mach/imx21-regs.h
index b8cb06075f..b8cb06075f 100644
--- a/include/asm-arm/arch-imx/imx21-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx21-regs.h
diff --git a/include/asm-arm/arch-imx/imx25-flash-header.h b/arch/arm/mach-imx/include/mach/imx25-flash-header.h
index 59860dbda7..59860dbda7 100644
--- a/include/asm-arm/arch-imx/imx25-flash-header.h
+++ b/arch/arm/mach-imx/include/mach/imx25-flash-header.h
diff --git a/include/asm-arm/arch-imx/imx25-regs.h b/arch/arm/mach-imx/include/mach/imx25-regs.h
index efbdbaad9b..efbdbaad9b 100644
--- a/include/asm-arm/arch-imx/imx25-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx25-regs.h
diff --git a/include/asm-arm/arch-imx/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h
index 33d67d6f50..33d67d6f50 100644
--- a/include/asm-arm/arch-imx/imx27-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx27-regs.h
diff --git a/include/asm-arm/arch-imx/imx31-regs.h b/arch/arm/mach-imx/include/mach/imx31-regs.h
index 3cae3a21db..3cae3a21db 100644
--- a/include/asm-arm/arch-imx/imx31-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx31-regs.h
diff --git a/include/asm-arm/arch-imx/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h
index db1eeba70d..db1eeba70d 100644
--- a/include/asm-arm/arch-imx/imx35-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx35-regs.h
diff --git a/include/asm-arm/arch-imx/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h
index ca7ea32fb4..ca7ea32fb4 100644
--- a/include/asm-arm/arch-imx/imxfb.h
+++ b/arch/arm/mach-imx/include/mach/imxfb.h
diff --git a/include/asm-arm/arch-imx/iomux-mx25.h b/arch/arm/mach-imx/include/mach/iomux-mx25.h
index aaacc3e722..020b7f214f 100644
--- a/include/asm-arm/arch-imx/iomux-mx25.h
+++ b/arch/arm/mach-imx/include/mach/iomux-mx25.h
@@ -1,7 +1,7 @@
 #ifndef __MACH_IOMUX_MX25_H__
 #define __MACH_IOMUX_MX25_H__
 
-#include <asm/arch/iomux-v3.h>
+#include <mach/iomux-v3.h>
 
 #define SRE		(1 << 0)
 #define DSE_STD		(0 << 1)
diff --git a/include/asm-arm/arch-imx/iomux-mx31.h b/arch/arm/mach-imx/include/mach/iomux-mx31.h
index 16c8e51e8c..16c8e51e8c 100644
--- a/include/asm-arm/arch-imx/iomux-mx31.h
+++ b/arch/arm/mach-imx/include/mach/iomux-mx31.h
diff --git a/include/asm-arm/arch-imx/iomux-mx35.h b/arch/arm/mach-imx/include/mach/iomux-mx35.h
index 16a109a156..8a56d86791 100644
--- a/include/asm-arm/arch-imx/iomux-mx35.h
+++ b/arch/arm/mach-imx/include/mach/iomux-mx35.h
@@ -19,7 +19,7 @@
 #ifndef __MACH_IOMUX_MX35_H__
 #define __MACH_IOMUX_MX35_H__
 
-#include <asm/arch/iomux-v3.h>
+#include <mach/iomux-v3.h>
 
 /*
  * The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>
diff --git a/include/asm-arm/arch-imx/iomux-v3.h b/arch/arm/mach-imx/include/mach/iomux-v3.h
index 8b2f1ae7f9..8b2f1ae7f9 100644
--- a/include/asm-arm/arch-imx/iomux-v3.h
+++ b/arch/arm/mach-imx/include/mach/iomux-v3.h
diff --git a/include/asm-arm/arch-imx/pmic.h b/arch/arm/mach-imx/include/mach/pmic.h
index e9a951bd38..e9a951bd38 100644
--- a/include/asm-arm/arch-imx/pmic.h
+++ b/arch/arm/mach-imx/include/mach/pmic.h
diff --git a/include/asm-arm/arch-imx/spi.h b/arch/arm/mach-imx/include/mach/spi.h
index 08be445e8e..08be445e8e 100644
--- a/include/asm-arm/arch-imx/spi.h
+++ b/arch/arm/mach-imx/include/mach/spi.h
diff --git a/include/asm-arm/arch-imx/u-boot.lds.h b/arch/arm/mach-imx/include/mach/u-boot.lds.h
index 52eb458f0f..52eb458f0f 100644
--- a/include/asm-arm/arch-imx/u-boot.lds.h
+++ b/arch/arm/mach-imx/include/mach/u-boot.lds.h
diff --git a/arch/arm/mach-imx/iomux-v2.c b/arch/arm/mach-imx/iomux-v2.c
index d040deeec5..abb2ebe195 100644
--- a/arch/arm/mach-imx/iomux-v2.c
+++ b/arch/arm/mach-imx/iomux-v2.c
@@ -19,8 +19,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux-mx31.h>
+#include <mach/imx-regs.h>
+#include <mach/iomux-mx31.h>
 
 /*
  * IOMUX register (base) addresses
diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
index 3b9416e95f..a74f942509 100644
--- a/arch/arm/mach-imx/iomux-v3.c
+++ b/arch/arm/mach-imx/iomux-v3.c
@@ -20,8 +20,8 @@
  */
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/iomux-v3.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/iomux-v3.h>
+#include <mach/imx-regs.h>
 
 /*
  * setups a single pin:
diff --git a/arch/arm/mach-imx/speed-imx1.c b/arch/arm/mach-imx/speed-imx1.c
index 9db5d113c5..41b56deeb4 100644
--- a/arch/arm/mach-imx/speed-imx1.c
+++ b/arch/arm/mach-imx/speed-imx1.c
@@ -23,8 +23,8 @@
 
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <init.h>
 #include <driver.h>
 
diff --git a/arch/arm/mach-imx/speed-imx21.c b/arch/arm/mach-imx/speed-imx21.c
index c9d6d88351..aa0a5281d8 100644
--- a/arch/arm/mach-imx/speed-imx21.c
+++ b/arch/arm/mach-imx/speed-imx21.c
@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/generic.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/generic.h>
+#include <mach/clock.h>
 #include <init.h>
 
 #ifndef CLK32
diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c
index bc2af193a8..be20880b25 100644
--- a/arch/arm/mach-imx/speed-imx25.c
+++ b/arch/arm/mach-imx/speed-imx25.c
@@ -1,7 +1,7 @@
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <init.h>
 
 unsigned long imx_get_mpllclk(void)
diff --git a/arch/arm/mach-imx/speed-imx27.c b/arch/arm/mach-imx/speed-imx27.c
index 61fcc72bf2..deaca1eb4d 100644
--- a/arch/arm/mach-imx/speed-imx27.c
+++ b/arch/arm/mach-imx/speed-imx27.c
@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/generic.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/generic.h>
+#include <mach/clock.h>
 #include <init.h>
 
 #ifndef CLK32
diff --git a/arch/arm/mach-imx/speed-imx31.c b/arch/arm/mach-imx/speed-imx31.c
index 77f861053c..630c648dbf 100644
--- a/arch/arm/mach-imx/speed-imx31.c
+++ b/arch/arm/mach-imx/speed-imx31.c
@@ -17,8 +17,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <init.h>
 
 ulong imx_get_mpl_dpdgck_clk(void)
diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c
index 43a6ddb350..8d1614f3de 100644
--- a/arch/arm/mach-imx/speed-imx35.c
+++ b/arch/arm/mach-imx/speed-imx35.c
@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <init.h>
 
 unsigned long imx_get_mpllclk(void)
diff --git a/arch/arm/mach-netx/clocksource.c b/arch/arm/mach-netx/clocksource.c
index b326c15532..818709df47 100644
--- a/arch/arm/mach-netx/clocksource.c
+++ b/arch/arm/mach-netx/clocksource.c
@@ -25,7 +25,7 @@
 #include <common.h>
 #include <init.h>
 #include <clock.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 
 uint64_t netx_clocksource_read(void)
 {
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index 985f3b8cef..4af945f4d6 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -20,7 +20,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include "eth_firmware.h"
 
 struct fw_header {
diff --git a/include/asm-arm/arch-netx/netx-cm.h b/arch/arm/mach-netx/include/mach/netx-cm.h
index 37cf76d1f9..37cf76d1f9 100644
--- a/include/asm-arm/arch-netx/netx-cm.h
+++ b/arch/arm/mach-netx/include/mach/netx-cm.h
diff --git a/include/asm-arm/arch-netx/netx-eth.h b/arch/arm/mach-netx/include/mach/netx-eth.h
index 654cfe73d3..654cfe73d3 100644
--- a/include/asm-arm/arch-netx/netx-eth.h
+++ b/arch/arm/mach-netx/include/mach/netx-eth.h
diff --git a/include/asm-arm/arch-netx/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h
index c2278cdc48..c2278cdc48 100644
--- a/include/asm-arm/arch-netx/netx-regs.h
+++ b/arch/arm/mach-netx/include/mach/netx-regs.h
diff --git a/include/asm-arm/arch-netx/netx-xc.h b/arch/arm/mach-netx/include/mach/netx-xc.h
index 060a9b3b02..060a9b3b02 100644
--- a/include/asm-arm/arch-netx/netx-xc.h
+++ b/arch/arm/mach-netx/include/mach/netx-xc.h
diff --git a/arch/arm/mach-netx/interrupts.c b/arch/arm/mach-netx/interrupts.c
index d163a51fd3..af78e19bfd 100644
--- a/arch/arm/mach-netx/interrupts.c
+++ b/arch/arm/mach-netx/interrupts.c
@@ -1,6 +1,6 @@
 #include <common.h>
 
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 
 int timer_init (void)
 {
diff --git a/arch/arm/mach-netx/netx-cm.c b/arch/arm/mach-netx/netx-cm.c
index 2a7ac1fb9e..58b204274a 100644
--- a/arch/arm/mach-netx/netx-cm.c
+++ b/arch/arm/mach-netx/netx-cm.c
@@ -1,6 +1,6 @@
 #include <common.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/netx-cm.h>
+#include <mach/netx-regs.h>
+#include <mach/netx-cm.h>
 
 #define I2C_CTRL_ENABLE		(1<<0)
 #define I2C_CTRL_SPEED_25	(0<<1)
diff --git a/arch/arm/mach-omap/gpmc.c b/arch/arm/mach-omap/gpmc.c
index 4e7383ccc0..2b9964950d 100644
--- a/arch/arm/mach-omap/gpmc.c
+++ b/arch/arm/mach-omap/gpmc.c
@@ -30,10 +30,10 @@
 #include <common.h>
 #include <init.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /**
  * @brief Do a Generic initialization of GPMC. if you choose otherwise,
diff --git a/include/asm-arm/arch-omap/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h
index 042f777ac2..1221238de8 100644
--- a/include/asm-arm/arch-omap/clocks.h
+++ b/arch/arm/mach-omap/include/mach/clocks.h
@@ -42,7 +42,7 @@
 #define S38_4M		38400000
 
 #ifdef CONFIG_ARCH_OMAP3
-#include <asm/arch/omap3-clock.h>
+#include <mach/omap3-clock.h>
 #endif
 
 #endif /* __OMAP_CLOCKS_H_ */
diff --git a/include/asm-arm/arch-omap/control.h b/arch/arm/mach-omap/include/mach/control.h
index 8301ead5f0..7c1614cc24 100644
--- a/include/asm-arm/arch-omap/control.h
+++ b/arch/arm/mach-omap/include/mach/control.h
@@ -91,7 +91,7 @@
 
 /**
  * macro for Padconfig Registers @see
- * include/asm/arch-arm/arch-omap/omap3-mux.h
+ * include/mach-arm/arch-omap/omap3-mux.h
  */
 #define	CP(X) (CONTROL_PADCONF_##X)
 
diff --git a/include/asm-arm/arch-omap/gpmc.h b/arch/arm/mach-omap/include/mach/gpmc.h
index a658cf00e7..a658cf00e7 100644
--- a/include/asm-arm/arch-omap/gpmc.h
+++ b/arch/arm/mach-omap/include/mach/gpmc.h
diff --git a/include/asm-arm/arch-omap/gpmc_nand.h b/arch/arm/mach-omap/include/mach/gpmc_nand.h
index c6c51d5d52..c6c51d5d52 100644
--- a/include/asm-arm/arch-omap/gpmc_nand.h
+++ b/arch/arm/mach-omap/include/mach/gpmc_nand.h
diff --git a/include/asm-arm/arch-omap/intc.h b/arch/arm/mach-omap/include/mach/intc.h
index 48fcf3d1d6..48fcf3d1d6 100644
--- a/include/asm-arm/arch-omap/intc.h
+++ b/arch/arm/mach-omap/include/mach/intc.h
diff --git a/include/asm-arm/arch-omap/omap3-clock.h b/arch/arm/mach-omap/include/mach/omap3-clock.h
index 22694f2367..22694f2367 100644
--- a/include/asm-arm/arch-omap/omap3-clock.h
+++ b/arch/arm/mach-omap/include/mach/omap3-clock.h
diff --git a/include/asm-arm/arch-omap/omap3-mux.h b/arch/arm/mach-omap/include/mach/omap3-mux.h
index 2badc3f851..2badc3f851 100644
--- a/include/asm-arm/arch-omap/omap3-mux.h
+++ b/arch/arm/mach-omap/include/mach/omap3-mux.h
diff --git a/include/asm-arm/arch-omap/omap3-silicon.h b/arch/arm/mach-omap/include/mach/omap3-silicon.h
index dde241272f..dde241272f 100644
--- a/include/asm-arm/arch-omap/omap3-silicon.h
+++ b/arch/arm/mach-omap/include/mach/omap3-silicon.h
diff --git a/include/asm-arm/arch-omap/omap3-smx.h b/arch/arm/mach-omap/include/mach/omap3-smx.h
index 78cff95f5b..78cff95f5b 100644
--- a/include/asm-arm/arch-omap/omap3-smx.h
+++ b/arch/arm/mach-omap/include/mach/omap3-smx.h
diff --git a/include/asm-arm/arch-omap/sdrc.h b/arch/arm/mach-omap/include/mach/sdrc.h
index 9d2d2d1107..9d2d2d1107 100644
--- a/include/asm-arm/arch-omap/sdrc.h
+++ b/arch/arm/mach-omap/include/mach/sdrc.h
diff --git a/include/asm-arm/arch-omap/silicon.h b/arch/arm/mach-omap/include/mach/silicon.h
index df41a74f2f..22daa5c964 100644
--- a/include/asm-arm/arch-omap/silicon.h
+++ b/arch/arm/mach-omap/include/mach/silicon.h
@@ -23,7 +23,7 @@
 
 /* Each platform silicon header comes here */
 #ifdef CONFIG_ARCH_OMAP3
-#include <asm/arch/omap3-silicon.h>
+#include <mach/omap3-silicon.h>
 #endif
 
 /* If Architecture specific init functions are present */
diff --git a/include/asm-arm/arch-omap/sys_info.h b/arch/arm/mach-omap/include/mach/sys_info.h
index 43967209f1..43967209f1 100644
--- a/include/asm-arm/arch-omap/sys_info.h
+++ b/arch/arm/mach-omap/include/mach/sys_info.h
diff --git a/include/asm-arm/arch-omap/syslib.h b/arch/arm/mach-omap/include/mach/syslib.h
index c89f50b816..c89f50b816 100644
--- a/include/asm-arm/arch-omap/syslib.h
+++ b/arch/arm/mach-omap/include/mach/syslib.h
diff --git a/include/asm-arm/arch-omap/timers.h b/arch/arm/mach-omap/include/mach/timers.h
index a93824378c..a93824378c 100644
--- a/include/asm-arm/arch-omap/timers.h
+++ b/arch/arm/mach-omap/include/mach/timers.h
diff --git a/include/asm-arm/arch-omap/wdt.h b/arch/arm/mach-omap/include/mach/wdt.h
index 532252d080..532252d080 100644
--- a/include/asm-arm/arch-omap/wdt.h
+++ b/arch/arm/mach-omap/include/mach/wdt.h
diff --git a/arch/arm/mach-omap/omap3_clock.c b/arch/arm/mach-omap/omap3_clock.c
index ce26cb5fac..4e81ae80d4 100644
--- a/arch/arm/mach-omap/omap3_clock.c
+++ b/arch/arm/mach-omap/omap3_clock.c
@@ -40,11 +40,11 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/timers.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/clocks.h>
+#include <mach/timers.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /* Following functions are exported from omap3_clock_core.S */
 #ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
diff --git a/arch/arm/mach-omap/omap3_clock_core.S b/arch/arm/mach-omap/omap3_clock_core.S
index 6e10563fb4..872ae5abcd 100644
--- a/arch/arm/mach-omap/omap3_clock_core.S
+++ b/arch/arm/mach-omap/omap3_clock_core.S
@@ -37,9 +37,9 @@
  */
 
 #include <config.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/gpmc.h>
+#include <mach/silicon.h>
+#include <mach/clocks.h>
+#include <mach/gpmc.h>
 
 #ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
 /**
diff --git a/arch/arm/mach-omap/omap3_core.S b/arch/arm/mach-omap/omap3_core.S
index dece199fae..76f80e68ca 100644
--- a/arch/arm/mach-omap/omap3_core.S
+++ b/arch/arm/mach-omap/omap3_core.S
@@ -37,9 +37,9 @@
  */
 
 #include <config.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/wdt.h>
-#include <asm/arch/clocks.h>
+#include <mach/silicon.h>
+#include <mach/wdt.h>
+#include <mach/clocks.h>
 
 #ifdef CONFIG_ARCH_HAS_LOWLEVEL_INIT
 .globl arch_init_lowlevel
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
index 3acf911251..794d2fa8f2 100644
--- a/arch/arm/mach-omap/omap3_generic.c
+++ b/arch/arm/mach-omap/omap3_generic.c
@@ -37,15 +37,15 @@
 #include <common.h>
 #include <init.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/sdrc.h>
-#include <asm/arch/control.h>
-#include <asm/arch/omap3-smx.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/wdt.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/sdrc.h>
+#include <mach/control.h>
+#include <mach/omap3-smx.h>
+#include <mach/clocks.h>
+#include <mach/wdt.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /**
  * @brief Reset the CPU
diff --git a/arch/arm/mach-omap/s32k_clksource.c b/arch/arm/mach-omap/s32k_clksource.c
index 4166d83d75..353670c583 100644
--- a/arch/arm/mach-omap/s32k_clksource.c
+++ b/arch/arm/mach-omap/s32k_clksource.c
@@ -34,11 +34,11 @@
 #include <clock.h>
 #include <init.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/timers.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/clocks.h>
+#include <mach/timers.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /**
  * @brief Provide a simple clock read
diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c
index 0ca4ef21d3..51824dadb0 100644
--- a/arch/arm/mach-omap/syslib.c
+++ b/arch/arm/mach-omap/syslib.c
@@ -32,7 +32,7 @@
 
 #include <config.h>
 #include <asm/io.h>
-#include <asm/arch/syslib.h>
+#include <mach/syslib.h>
 
 /**
  * @brief simple spin loop
diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c
index 864977d7b8..f58cf95058 100644
--- a/arch/arm/mach-s3c24xx/generic.c
+++ b/arch/arm/mach-s3c24xx/generic.c
@@ -27,7 +27,7 @@
 #include <init.h>
 #include <clock.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 /**
  * Calculate the current M-PLL clock.
diff --git a/include/asm-arm/arch-s3c24xx/s3c24x0-iomap.h b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-iomap.h
index ab3dc4f20a..ab3dc4f20a 100644
--- a/include/asm-arm/arch-s3c24xx/s3c24x0-iomap.h
+++ b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-iomap.h
diff --git a/include/asm-arm/arch-s3c24xx/s3c24x0-nand.h b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-nand.h
index 05f9cf0fd1..05f9cf0fd1 100644
--- a/include/asm-arm/arch-s3c24xx/s3c24x0-nand.h
+++ b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-nand.h
diff --git a/include/asm-arm/arch-s3c24xx/s3c24xx-generic.h b/arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h
index 1691138279..1691138279 100644
--- a/include/asm-arm/arch-s3c24xx/s3c24xx-generic.h
+++ b/arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h
diff --git a/arch/arm/mach-s3c24xx/lowlevel-init.S b/arch/arm/mach-s3c24xx/lowlevel-init.S
index d27cfa5dfb..fd6b0f396d 100644
--- a/arch/arm/mach-s3c24xx/lowlevel-init.S
+++ b/arch/arm/mach-s3c24xx/lowlevel-init.S
@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 	.section ".text_bare_init.s3c24x0_disable_wd","ax"
 
diff --git a/board/a9m2410/a9m2410.c b/board/a9m2410/a9m2410.c
index ba3004e254..f327f82b7f 100644
--- a/board/a9m2410/a9m2410.c
+++ b/board/a9m2410/a9m2410.c
@@ -32,8 +32,8 @@
 #include <partition.h>
 #include <nand.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24x0-iomap.h>
-#include <asm/arch/s3c24x0-nand.h>
+#include <mach/s3c24x0-iomap.h>
+#include <mach/s3c24x0-nand.h>
 
 static struct memory_platform_data ram_pdata = {
 	.name		= "ram0",
diff --git a/board/a9m2410/lowlevel_init.S b/board/a9m2410/lowlevel_init.S
index 1af42ddcd1..461b93c3f1 100644
--- a/board/a9m2410/lowlevel_init.S
+++ b/board/a9m2410/lowlevel_init.S
@@ -3,7 +3,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 	.section ".text_bare_init.board_init_lowlevel","ax"
 
diff --git a/board/a9m2440/a9m2440.c b/board/a9m2440/a9m2440.c
index 669efeb576..e5cfee889b 100644
--- a/board/a9m2440/a9m2440.c
+++ b/board/a9m2440/a9m2440.c
@@ -32,8 +32,8 @@
 #include <partition.h>
 #include <nand.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24x0-iomap.h>
-#include <asm/arch/s3c24x0-nand.h>
+#include <mach/s3c24x0-iomap.h>
+#include <mach/s3c24x0-nand.h>
 
 static struct memory_platform_data ram_pdata = {
 	.name		= "ram0",
diff --git a/board/a9m2440/lowlevel_init.S b/board/a9m2440/lowlevel_init.S
index 1af42ddcd1..461b93c3f1 100644
--- a/board/a9m2440/lowlevel_init.S
+++ b/board/a9m2440/lowlevel_init.S
@@ -3,7 +3,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 	.section ".text_bare_init.board_init_lowlevel","ax"
 
diff --git a/board/at91sam9260ek/init.c b/board/at91sam9260ek/init.c
index d484e9b46c..bf40bc4895 100644
--- a/board/at91sam9260ek/init.c
+++ b/board/at91sam9260ek/init.c
@@ -33,9 +33,9 @@
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/board.h>
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/sam9_smc.h>
+#include <mach/board.h>
+#include <mach/at91sam9_smc.h>
+#include <mach/sam9_smc.h>
 #include <gpio.h>
 
 static struct atmel_nand_data nand_pdata = {
diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c
index 30d5ac02af..53041ddd4c 100644
--- a/board/eco920/eco920.c
+++ b/board/eco920/eco920.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/AT91RM9200.h>
+#include <mach/AT91RM9200.h>
 #include <at91rm9200_net.h>
 #include <dm9161.h>
 #include <miiphy.h>
diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
index 5d66a71284..0afc14fb75 100644
--- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -25,21 +25,21 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
 #include <notifier.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <nand.h>
 #include <command.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-pll.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-pll.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/eukrea_cpuimx27/lowlevel_init.S b/board/eukrea_cpuimx27/lowlevel_init.S
index 8f61721782..c7ac3410cc 100644
--- a/board/eukrea_cpuimx27/lowlevel_init.S
+++ b/board/eukrea_cpuimx27/lowlevel_init.S
@@ -1,5 +1,5 @@
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c
index 63217736ff..6f1342f656 100644
--- a/board/freescale-mx25-3-stack/3stack.c
+++ b/board/freescale-mx25-3-stack/3stack.c
@@ -25,17 +25,17 @@
 #include <init.h>
 #include <driver.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-nand.h>
 #include <fec.h>
 #include <nand.h>
-#include <asm/arch/imx25-flash-header.h>
-#include <asm/arch/iomux-mx25.h>
+#include <mach/imx25-flash-header.h>
+#include <mach/iomux-mx25.h>
 
 extern unsigned long _stext;
 
diff --git a/board/freescale-mx25-3-stack/lowlevel_init.S b/board/freescale-mx25-3-stack/lowlevel_init.S
index 9dcb84b211..c505dfd7d6 100644
--- a/board/freescale-mx25-3-stack/lowlevel_init.S
+++ b/board/freescale-mx25-3-stack/lowlevel_init.S
@@ -21,9 +21,9 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/esdctl.h>
+#include <mach/imx-regs.h>
+#include <mach/imx-pll.h>
+#include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
 
 #define writel(val, reg) \
diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
index 84b94f5abc..ade5d12f98 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/board/freescale-mx35-3-stack/3stack.c
@@ -23,20 +23,20 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <nand.h>
 #include <spi/spi.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/iomux-mx35.h>
+#include <mach/imx-nand.h>
+#include <mach/iomux-mx35.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/freescale-mx35-3-stack/lowlevel_init.S b/board/freescale-mx35-3-stack/lowlevel_init.S
index 02b0326ca3..f912a3a1b0 100644
--- a/board/freescale-mx35-3-stack/lowlevel_init.S
+++ b/board/freescale-mx35-3-stack/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/imx21ads/imx21ads.c b/board/imx21ads/imx21ads.c
index 3e1f47ff3c..ba67e462ba 100644
--- a/board/imx21ads/imx21ads.c
+++ b/board/imx21ads/imx21ads.c
@@ -26,15 +26,15 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-nand.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/imx21ads/lowlevel_init.S b/board/imx21ads/lowlevel_init.S
index ee3b0853ce..b13ec7b3e1 100644
--- a/board/imx21ads/lowlevel_init.S
+++ b/board/imx21ads/lowlevel_init.S
@@ -4,7 +4,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index d3524360a9..5f43d1b4f0 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -23,11 +23,11 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <asm/io.h>
 #include <fec.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
diff --git a/board/imx27ads/lowlevel_init.S b/board/imx27ads/lowlevel_init.S
index 57b93eb6b4..2d079b6156 100644
--- a/board/imx27ads/lowlevel_init.S
+++ b/board/imx27ads/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/mmccpu/init.c b/board/mmccpu/init.c
index 7f519e449a..bac8ef3854 100644
--- a/board/mmccpu/init.c
+++ b/board/mmccpu/init.c
@@ -33,10 +33,10 @@
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pmc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct device_d cfi_dev = {
 	.name		= "cfi_flash",
diff --git a/board/netx/netx.c b/board/netx/netx.c
index 6f6aa78e10..5276d59753 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -23,13 +23,13 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include <partition.h>
 #include <asm/armlinux.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <asm/mach-types.h>
-#include <asm/arch/netx-eth.h>
+#include <mach/netx-eth.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/omap/board-beagle.c b/board/omap/board-beagle.c
index 5da64d4997..282c532d30 100644
--- a/board/omap/board-beagle.c
+++ b/board/omap/board-beagle.c
@@ -53,13 +53,13 @@
 #include <driver.h>
 #include <asm/io.h>
 #include <ns16550.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/sdrc.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
-#include <asm/arch/control.h>
-#include <asm/arch/omap3-mux.h>
-#include <asm/arch/gpmc.h>
+#include <mach/silicon.h>
+#include <mach/sdrc.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
+#include <mach/control.h>
+#include <mach/omap3-mux.h>
+#include <mach/gpmc.h>
 #include "board.h"
 
 /******************** Board Boot Time *******************/
diff --git a/board/omap/board-sdp343x.c b/board/omap/board-sdp343x.c
index 2ddc5c2718..caf21087ff 100644
--- a/board/omap/board-sdp343x.c
+++ b/board/omap/board-sdp343x.c
@@ -48,13 +48,13 @@
 #include <driver.h>
 #include <asm/io.h>
 #include <ns16550.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/sdrc.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
-#include <asm/arch/control.h>
-#include <asm/arch/omap3-mux.h>
-#include <asm/arch/gpmc.h>
+#include <mach/silicon.h>
+#include <mach/sdrc.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
+#include <mach/control.h>
+#include <mach/omap3-mux.h>
+#include <mach/gpmc.h>
 #include "board.h"
 
 /******************** Board Boot Time *******************/
diff --git a/board/omap/devices-gpmc-nand.c b/board/omap/devices-gpmc-nand.c
index d6db8a36de..bbcceafe88 100644
--- a/board/omap/devices-gpmc-nand.c
+++ b/board/omap/devices-gpmc-nand.c
@@ -33,9 +33,9 @@
 #include <clock.h>
 #include <asm/io.h>
 
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/gpmc_nand.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/gpmc_nand.h>
 
 #ifdef CONFIG_MACH_OMAP_GPMC_GENERICNAND
 
diff --git a/board/omap/platform.S b/board/omap/platform.S
index c6ce875112..9014a8f1c7 100644
--- a/board/omap/platform.S
+++ b/board/omap/platform.S
@@ -32,7 +32,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/silicon.h>
+#include <mach/silicon.h>
 
 #ifdef CONFIG_MACH_DO_LOWLEVEL_INIT
 /**
diff --git a/board/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S
index bbd98ce5ee..a32d375dde 100644
--- a/board/pcm037/lowlevel_init.S
+++ b/board/pcm037/lowlevel_init.S
@@ -21,8 +21,8 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/imx-pll.h>
+#include <mach/imx-regs.h>
+#include <mach/imx-pll.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c
index e265ca4efb..2e9d5432e5 100644
--- a/board/pcm037/pcm037.c
+++ b/board/pcm037/pcm037.c
@@ -27,14 +27,14 @@
 #include <driver.h>
 #include <environment.h>
 #include <usb/isp1504.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux-mx31.h>
+#include <mach/imx-regs.h>
+#include <mach/iomux-mx31.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-nand.h>
 
 
 /*
diff --git a/board/pcm038/lowlevel_init.S b/board/pcm038/lowlevel_init.S
index 64c55778b1..759ecd77a9 100644
--- a/board/pcm038/lowlevel_init.S
+++ b/board/pcm038/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c
index 78815a985f..1556cd17fc 100644
--- a/board/pcm038/pcm038.c
+++ b/board/pcm038/pcm038.c
@@ -23,13 +23,13 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
 #include <notifier.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
@@ -37,12 +37,12 @@
 #include <command.h>
 #include <spi/spi.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/imxfb.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-pll.h>
+#include <mach/imxfb.h>
 #include <asm/mmu.h>
 #include <usb/isp1504.h>
-#include <asm/arch/spi.h>
+#include <mach/spi.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/pcm043/lowlevel_init.S b/board/pcm043/lowlevel_init.S
index 649bf387ed..8aa23cf8ac 100644
--- a/board/pcm043/lowlevel_init.S
+++ b/board/pcm043/lowlevel_init.S
@@ -21,9 +21,9 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/esdctl.h>
+#include <mach/imx-regs.h>
+#include <mach/imx-pll.h>
+#include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
 
 #define writel(val, reg) \
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index 166f2fa1cd..c53f551217 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -27,16 +27,16 @@
 #include <init.h>
 #include <driver.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-nand.h>
 #include <fec.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/iomux-mx35.h>
+#include <mach/imx-pll.h>
+#include <mach/iomux-mx35.h>
 
 #define CYG_MACRO_START
 #define CYG_MACRO_END
diff --git a/board/phycard-i.MX27/lowlevel_init.S b/board/phycard-i.MX27/lowlevel_init.S
index 64c55778b1..759ecd77a9 100644
--- a/board/phycard-i.MX27/lowlevel_init.S
+++ b/board/phycard-i.MX27/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/phycard-i.MX27/pca100.c b/board/phycard-i.MX27/pca100.c
index 8515977765..fc4934e250 100644
--- a/board/phycard-i.MX27/pca100.c
+++ b/board/phycard-i.MX27/pca100.c
@@ -23,9 +23,9 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
 #include <partition.h>
@@ -34,8 +34,8 @@
 #include <nand.h>
 #include <spi/spi.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-pll.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-pll.h>
 #include <gpio.h>
 #include <asm/mmu.h>
 #include <usb/isp1504.h>
diff --git a/board/pm9263/init.c b/board/pm9263/init.c
index 0d3d6d9412..1060fe27a3 100644
--- a/board/pm9263/init.c
+++ b/board/pm9263/init.c
@@ -33,10 +33,10 @@
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pmc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/scb9328/lowlevel_init.S b/board/scb9328/lowlevel_init.S
index 6a51f5bf9f..5b024286bb 100644
--- a/board/scb9328/lowlevel_init.S
+++ b/board/scb9328/lowlevel_init.S
@@ -18,7 +18,7 @@
  *
  */
 
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define CPU200
 
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index af666f2af1..6b86352e6a 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -24,9 +24,9 @@
 #include <init.h>
 #include <environment.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <fs.h>
diff --git a/drivers/nand/atmel_nand.c b/drivers/nand/atmel_nand.c
index 9481990b8b..e8f85fc621 100644
--- a/drivers/nand/atmel_nand.c
+++ b/drivers/nand/atmel_nand.c
@@ -32,7 +32,7 @@
 #include <linux/mtd/nand.h>
 
 #include <asm/io.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #include <errno.h>
 
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index bda8ecf4bf..1198deb671 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -24,8 +24,8 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
 
diff --git a/drivers/nand/nand_imx_v2.c b/drivers/nand/nand_imx_v2.c
index 6b47022130..b74ade7810 100644
--- a/drivers/nand/nand_imx_v2.c
+++ b/drivers/nand/nand_imx_v2.c
@@ -17,8 +17,8 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
 
diff --git a/drivers/nand/nand_omap_gpmc.c b/drivers/nand/nand_omap_gpmc.c
index cc365bc3cf..c6647e56ed 100644
--- a/drivers/nand/nand_omap_gpmc.c
+++ b/drivers/nand/nand_omap_gpmc.c
@@ -72,9 +72,9 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/gpmc_nand.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/gpmc_nand.h>
 
 /* Enable me to get tons of debug messages -for use without jtag */
 #if 0
diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c
index 6423f85b63..b1fe377bef 100644
--- a/drivers/nand/nand_s3c2410.c
+++ b/drivers/nand/nand_s3c2410.c
@@ -30,9 +30,9 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/s3c24xx-generic.h>
-#include <asm/arch/s3c24x0-iomap.h>
-#include <asm/arch/s3c24x0-nand.h>
+#include <mach/s3c24xx-generic.h>
+#include <mach/s3c24x0-iomap.h>
+#include <mach/s3c24x0-nand.h>
 #include <asm/io.h>
 #include <asm-generic/errno.h>
 
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 6591b7b06b..9d8b8c75c5 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -29,9 +29,9 @@
 
 #include <asm/mmu.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <clock.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <xfuncs.h>
 
 #include "fec_imx.h"
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index fabb4fa8f3..693e64f278 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -47,8 +47,8 @@
 #include <miiphy.h>
 #include <errno.h>
 #include <asm/io.h>
-#include <asm/arch/board.h>
-#include <asm/arch/clk.h>
+#include <mach/board.h>
+#include <mach/clk.h>
 
 #include "macb.h"
 
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 6c52fb790c..e29f69ccb5 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -3,9 +3,9 @@
 #include <net.h>
 #include <asm/io.h>
 #include <miiphy.h>
-#include <asm/arch/netx-xc.h>
-#include <asm/arch/netx-eth.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-xc.h>
+#include <mach/netx-eth.h>
+#include <mach/netx-regs.h>
 #include <xfuncs.h>
 #include <miiphy.h>
 #include <init.h>
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c
index 3901835c16..e9e8116619 100644
--- a/drivers/serial/atmel.c
+++ b/drivers/serial/atmel.c
@@ -22,7 +22,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/arch/clk.h>
+#include <mach/clk.h>
 
 /* USART3 register offsets */
 #define USART3_CR				0x0000
diff --git a/drivers/serial/serial_at91rm9200.c b/drivers/serial/serial_at91rm9200.c
index 7f00b30ad6..f5546aa758 100644
--- a/drivers/serial/serial_at91rm9200.c
+++ b/drivers/serial/serial_at91rm9200.c
@@ -31,7 +31,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #if !defined(CONFIG_DBGU) && !defined(CONFIG_USART0) && !defined(CONFIG_USART1)
 #error must define one of CONFIG_DBGU or CONFIG_USART0 or CONFIG_USART1
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 89f1c4a9af..91d3b188cc 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -18,8 +18,8 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c
index 68b4d20751..7c095197fd 100644
--- a/drivers/serial/serial_netx.c
+++ b/drivers/serial/serial_netx.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index 92e9fa9b0c..fedddd33b3 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -25,8 +25,8 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24xx-generic.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24xx-generic.h>
+#include <mach/s3c24x0-iomap.h>
 
 /* Note: Offsets are for little endian access */
 #define ULCON 0x00		/* line control */
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index 8a483082ef..5c9791978a 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -25,7 +25,7 @@
 #include <xfuncs.h>
 #include <asm/io.h>
 #include <gpio.h>
-#include <asm/arch/spi.h>
+#include <mach/spi.h>
 
 #define MXC_CSPIRXDATA		0x00
 #define MXC_CSPITXDATA		0x04
diff --git a/drivers/spi/mc13783.c b/drivers/spi/mc13783.c
index 1cded4b783..19e2780920 100644
--- a/drivers/spi/mc13783.c
+++ b/drivers/spi/mc13783.c
@@ -24,7 +24,7 @@
 #include <spi/spi.h>
 #include <xfuncs.h>
 #include <errno.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 
 #define REG_INTERRUPT_STATUS_0			0x0
 #define	REG_INTERRUPT_MASK			0x1
diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index 10aaa80cf3..9a30ca46f3 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -17,14 +17,14 @@
 #include <common.h>
 #include <fb.h>
 #include <asm/io.h>
-#include <asm/arch/imxfb.h>
+#include <mach/imxfb.h>
 #include <driver.h>
 #include <malloc.h>
 #include <errno.h>
 #include <init.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm-generic/div64.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 #define LCDC_SSA	0x00
 
diff --git a/include/asm-arm/.gitignore b/include/asm-arm/.gitignore
deleted file mode 100644
index 673849bfc9..0000000000
--- a/include/asm-arm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-arch
-proc
diff --git a/include/asm-generic/u-boot.lds.h b/include/asm-generic/u-boot.lds.h
index 4982ce03db..1a5f2f7753 100644
--- a/include/asm-generic/u-boot.lds.h
+++ b/include/asm-generic/u-boot.lds.h
@@ -1,6 +1,6 @@
 
 #ifdef CONFIG_ARCH_IMX25
-#include <asm/arch/u-boot.lds.h>
+#include <mach/u-boot.lds.h>
 #endif
 
 #ifndef PRE_IMAGE
diff --git a/include/debug_ll.h b/include/debug_ll.h
index f06fa6e57a..e99ae7d207 100644
--- a/include/debug_ll.h
+++ b/include/debug_ll.h
@@ -26,7 +26,7 @@
 #define   __INCLUDE_DEBUG_LL_H__
 
 #if defined (CONFIG_DEBUG_LL)
-# include <asm/arch/debug_ll.h>
+# include <mach/debug_ll.h>
 
 #define PUTC_LL(x) putc(x)
 # define PUTHEX_LL(value)  ({ unsigned long v = (unsigned long) (value); \