From patchwork Fri Feb 20 08:04:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 441883 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 9417514018C for ; Fri, 20 Feb 2015 19:06:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 24C3D4B7D0; Fri, 20 Feb 2015 09:06:06 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wBw3-YUyeEoF; Fri, 20 Feb 2015 09:06:06 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CF1974B7DE; Fri, 20 Feb 2015 09:05:15 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7613B4B782 for ; Fri, 20 Feb 2015 09:04:54 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j4Tzm24-rJlL for ; Fri, 20 Feb 2015 09:04:54 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from smtp.mei.co.jp (smtp.mei.co.jp [133.183.100.20]) by theia.denx.de (Postfix) with ESMTP id D0FA14B71D for ; Fri, 20 Feb 2015 09:04:48 +0100 (CET) Received: from mail-gw.jp.panasonic.com ([157.8.1.157]) by smtp.mei.co.jp (8.12.11.20060614/3.7W/kc-maile11) with ESMTP id t1K84NEl024570; Fri, 20 Feb 2015 17:04:23 +0900 (JST) Received: from epochmail.jp.panasonic.com ([157.8.1.130]) by mail.jp.panasonic.com (8.11.6p2/3.7W/kc-maili14) with ESMTP id t1K84NL31725; Fri, 20 Feb 2015 17:04:23 +0900 Received: by epochmail.jp.panasonic.com (8.12.11.20060308/3.7W/lomi17) id t1K84NR2005083; Fri, 20 Feb 2015 17:04:23 +0900 Received: from poodle by lomi17.jp.panasonic.com (8.12.11.20060308/3.7W) with ESMTP id t1K84NuA005020; Fri, 20 Feb 2015 17:04:23 +0900 Received: from beagle.diag.org (beagle.diag.org [10.184.179.16]) by poodle (Postfix) with ESMTP id 683A72740043; Fri, 20 Feb 2015 17:04:23 +0900 (JST) From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 20 Feb 2015 17:04:13 +0900 Message-Id: <1424419459-3498-14-git-send-email-yamada.m@jp.panasonic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424419459-3498-1-git-send-email-yamada.m@jp.panasonic.com> References: <1424419459-3498-1-git-send-email-yamada.m@jp.panasonic.com> MIME-Version: 1.0 Cc: Stefan Roese , "angelo@sysam.it" , Tom Rini Subject: [U-Boot] [PATCH v3 13/19] ARM: at91: move SoC headers to mach-at91/include/mach X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move arch/arm/include/asm/arch-at91/* -> arch/arm/mach-at91/include/mach/* Signed-off-by: Masahiro Yamada Acked-by: Andreas Bießmann --- Changes in v3: - Move two more headers. They were added after I sent the RFC. MAINTAINERS | 1 - arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_common.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_dbu.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_eefc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_emac.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_gpbr.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_matrix.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_mc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pdc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pio.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pit.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pmc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rstc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rtt.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_spi.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_st.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_tc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_wdt.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91rm9200.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9260.h | 0 .../asm/arch-at91 => mach-at91/include/mach}/at91sam9260_matrix.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9261.h | 0 .../asm/arch-at91 => mach-at91/include/mach}/at91sam9261_matrix.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9263.h | 0 .../asm/arch-at91 => mach-at91/include/mach}/at91sam9263_matrix.h | 0 .../{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_matrix.h | 0 .../{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_sdramc.h | 0 .../arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_smc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9g45.h | 0 .../asm/arch-at91 => mach-at91/include/mach}/at91sam9g45_matrix.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9rl.h | 0 .../asm/arch-at91 => mach-at91/include/mach}/at91sam9rl_matrix.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9x5.h | 0 .../asm/arch-at91 => mach-at91/include/mach}/at91sam9x5_matrix.h | 0 .../arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_mpddrc.h | 0 .../arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_serial.h | 0 .../{include/asm/arch-at91 => mach-at91/include/mach}/atmel_usba_udc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/clk.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/gpio.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/hardware.h | 0 .../arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_matrix.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_sfr.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3_smc.h | 0 arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d4.h | 0 45 files changed, 1 deletion(-) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_common.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_dbu.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_eefc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_emac.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_gpbr.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_mc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pdc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pio.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pit.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pmc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rstc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rtt.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_spi.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_st.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_tc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_wdt.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91rm9200.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9260.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9260_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9261.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9261_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9263.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9263_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_sdramc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_smc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9g45.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9g45_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9rl.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9rl_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9x5.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9x5_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_mpddrc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_serial.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_usba_udc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_sfr.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3_smc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d4.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e4edf45..7a3e963 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -77,7 +77,6 @@ M: Andreas Bießmann S: Maintained T: git git://git.denx.de/u-boot-atmel.git F: arch/arm/mach-at91/ -F: arch/arm/include/asm/arch-at91/ ARM FREESCALE IMX M: Stefano Babic diff --git a/arch/arm/include/asm/arch-at91/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_common.h rename to arch/arm/mach-at91/include/mach/at91_common.h diff --git a/arch/arm/include/asm/arch-at91/at91_dbu.h b/arch/arm/mach-at91/include/mach/at91_dbu.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_dbu.h rename to arch/arm/mach-at91/include/mach/at91_dbu.h diff --git a/arch/arm/include/asm/arch-at91/at91_eefc.h b/arch/arm/mach-at91/include/mach/at91_eefc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_eefc.h rename to arch/arm/mach-at91/include/mach/at91_eefc.h diff --git a/arch/arm/include/asm/arch-at91/at91_emac.h b/arch/arm/mach-at91/include/mach/at91_emac.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_emac.h rename to arch/arm/mach-at91/include/mach/at91_emac.h diff --git a/arch/arm/include/asm/arch-at91/at91_gpbr.h b/arch/arm/mach-at91/include/mach/at91_gpbr.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_gpbr.h rename to arch/arm/mach-at91/include/mach/at91_gpbr.h diff --git a/arch/arm/include/asm/arch-at91/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_matrix.h rename to arch/arm/mach-at91/include/mach/at91_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91_mc.h b/arch/arm/mach-at91/include/mach/at91_mc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_mc.h rename to arch/arm/mach-at91/include/mach/at91_mc.h diff --git a/arch/arm/include/asm/arch-at91/at91_pdc.h b/arch/arm/mach-at91/include/mach/at91_pdc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pdc.h rename to arch/arm/mach-at91/include/mach/at91_pdc.h diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pio.h rename to arch/arm/mach-at91/include/mach/at91_pio.h diff --git a/arch/arm/include/asm/arch-at91/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pit.h rename to arch/arm/mach-at91/include/mach/at91_pit.h diff --git a/arch/arm/include/asm/arch-at91/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pmc.h rename to arch/arm/mach-at91/include/mach/at91_pmc.h diff --git a/arch/arm/include/asm/arch-at91/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_rstc.h rename to arch/arm/mach-at91/include/mach/at91_rstc.h diff --git a/arch/arm/include/asm/arch-at91/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_rtt.h rename to arch/arm/mach-at91/include/mach/at91_rtt.h diff --git a/arch/arm/include/asm/arch-at91/at91_spi.h b/arch/arm/mach-at91/include/mach/at91_spi.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_spi.h rename to arch/arm/mach-at91/include/mach/at91_spi.h diff --git a/arch/arm/include/asm/arch-at91/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_st.h rename to arch/arm/mach-at91/include/mach/at91_st.h diff --git a/arch/arm/include/asm/arch-at91/at91_tc.h b/arch/arm/mach-at91/include/mach/at91_tc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_tc.h rename to arch/arm/mach-at91/include/mach/at91_tc.h diff --git a/arch/arm/include/asm/arch-at91/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_wdt.h rename to arch/arm/mach-at91/include/mach/at91_wdt.h diff --git a/arch/arm/include/asm/arch-at91/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91rm9200.h rename to arch/arm/mach-at91/include/mach/at91rm9200.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9260.h rename to arch/arm/mach-at91/include/mach/at91sam9260.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9260_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9260_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9261.h rename to arch/arm/mach-at91/include/mach/at91sam9261.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9261_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9261_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9263.h rename to arch/arm/mach-at91/include/mach/at91sam9263.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9263_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9263_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9_sdramc.h rename to arch/arm/mach-at91/include/mach/at91sam9_sdramc.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9_smc.h rename to arch/arm/mach-at91/include/mach/at91sam9_smc.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9g45.h rename to arch/arm/mach-at91/include/mach/at91sam9g45.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9rl.h rename to arch/arm/mach-at91/include/mach/at91sam9rl.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9x5.h rename to arch/arm/mach-at91/include/mach/at91sam9x5.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h diff --git a/arch/arm/include/asm/arch-at91/atmel_mpddrc.h b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/atmel_mpddrc.h rename to arch/arm/mach-at91/include/mach/atmel_mpddrc.h diff --git a/arch/arm/include/asm/arch-at91/atmel_serial.h b/arch/arm/mach-at91/include/mach/atmel_serial.h similarity index 100% rename from arch/arm/include/asm/arch-at91/atmel_serial.h rename to arch/arm/mach-at91/include/mach/atmel_serial.h diff --git a/arch/arm/include/asm/arch-at91/atmel_usba_udc.h b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/atmel_usba_udc.h rename to arch/arm/mach-at91/include/mach/atmel_usba_udc.h diff --git a/arch/arm/include/asm/arch-at91/clk.h b/arch/arm/mach-at91/include/mach/clk.h similarity index 100% rename from arch/arm/include/asm/arch-at91/clk.h rename to arch/arm/mach-at91/include/mach/clk.h diff --git a/arch/arm/include/asm/arch-at91/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-at91/gpio.h rename to arch/arm/mach-at91/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-at91/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h similarity index 100% rename from arch/arm/include/asm/arch-at91/hardware.h rename to arch/arm/mach-at91/include/mach/hardware.h diff --git a/arch/arm/include/asm/arch-at91/sama5_matrix.h b/arch/arm/mach-at91/include/mach/sama5_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5_matrix.h rename to arch/arm/mach-at91/include/mach/sama5_matrix.h diff --git a/arch/arm/include/asm/arch-at91/sama5_sfr.h b/arch/arm/mach-at91/include/mach/sama5_sfr.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5_sfr.h rename to arch/arm/mach-at91/include/mach/sama5_sfr.h diff --git a/arch/arm/include/asm/arch-at91/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5d3.h rename to arch/arm/mach-at91/include/mach/sama5d3.h diff --git a/arch/arm/include/asm/arch-at91/sama5d3_smc.h b/arch/arm/mach-at91/include/mach/sama5d3_smc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5d3_smc.h rename to arch/arm/mach-at91/include/mach/sama5d3_smc.h diff --git a/arch/arm/include/asm/arch-at91/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5d4.h rename to arch/arm/mach-at91/include/mach/sama5d4.h