From 9d0412680e6c7b685ee466842047bcfb924d6dc5 Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Mon, 5 Feb 2007 11:42:07 +0100 Subject: [PATCH] [ARM] 4124/1: Rename mach-at91rm9200 and arch-at91rm9200 directories Now that Linux includes support for the Atmel AT91SAM9260 and AT91SAM9261 processors in addition to the original Atmel AT91RM9200 (with support for more AT91 processors pending), the "mach-at91rm9200" and "arch-at91rm9200" directories should be renamed to indicate their more generic nature. The following git commands should be run BEFORE applying this patch: git-mv arch/arm/mach-at91rm9200 arch/arm/mach-at91 git-mv include/asm-arm/arch-at91rm9200 include/asm-arm/arch-at91 Signed-off-by: Andrew Victor Signed-off-by: Russell King --- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/Kconfig | 0 arch/arm/{mach-at91rm9200 => mach-at91}/Makefile | 0 arch/arm/{mach-at91rm9200 => mach-at91}/Makefile.boot | 0 arch/arm/{mach-at91rm9200 => mach-at91}/at91rm9200.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/at91rm9200_devices.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/at91rm9200_time.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9260.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9260_devices.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9261.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9261_devices.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/at91sam926x_time.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-1arm.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-carmeva.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-csb337.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-csb637.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-dk.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-eb9200.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-ek.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-kafa.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-kb9202.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-sam9260ek.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/board-sam9261ek.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/clock.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/clock.h | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/generic.h | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/gpio.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/irq.c | 2 +- arch/arm/{mach-at91rm9200 => mach-at91}/leds.c | 0 arch/arm/{mach-at91rm9200 => mach-at91}/pm.c | 2 +- arch/avr32/mach-at32ap/clock.c | 2 +- arch/avr32/mach-at32ap/clock.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_aic.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_dbgu.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_ecc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_lcdc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_mci.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pdc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pio.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pit.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pmc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_rstc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_rtc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_rtt.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_shdwc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_spi.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_ssc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_st.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_tc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_twi.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_wdt.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91rm9200.h | 2 +- .../asm-arm/{arch-at91rm9200 => arch-at91}/at91rm9200_emac.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91rm9200_mc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9260.h | 2 +- .../asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9260_matrix.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9261.h | 2 +- .../asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9261_matrix.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam926x_mc.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/board.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/cpu.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/debug-macro.S | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/dma.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/entry-macro.S | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/gpio.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/hardware.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/io.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/irqs.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/memory.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/system.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/timex.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/uncompress.h | 2 +- include/asm-arm/{arch-at91rm9200 => arch-at91}/vmalloc.h | 2 +- include/asm-avr32/arch-at32ap/at91_pdc.h | 2 +- 75 files changed, 71 insertions(+), 71 deletions(-) rename arch/arm/{mach-at91rm9200 => mach-at91}/Kconfig (100%) rename arch/arm/{mach-at91rm9200 => mach-at91}/Makefile (100%) rename arch/arm/{mach-at91rm9200 => mach-at91}/Makefile.boot (100%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91rm9200.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91rm9200_devices.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91rm9200_time.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9260.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9260_devices.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9261.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91sam9261_devices.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/at91sam926x_time.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-1arm.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-carmeva.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-csb337.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-csb637.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-dk.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-eb9200.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-ek.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-kafa.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-kb9202.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-sam9260ek.c (98%) rename arch/arm/{mach-at91rm9200 => mach-at91}/board-sam9261ek.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/clock.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/clock.h (94%) rename arch/arm/{mach-at91rm9200 => mach-at91}/generic.h (97%) rename arch/arm/{mach-at91rm9200 => mach-at91}/gpio.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/irq.c (99%) rename arch/arm/{mach-at91rm9200 => mach-at91}/leds.c (100%) rename arch/arm/{mach-at91rm9200 => mach-at91}/pm.c (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_aic.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_dbgu.h (97%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_ecc.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_lcdc.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_mci.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pdc.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pio.h (97%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pit.h (95%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_pmc.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_rstc.h (97%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_rtc.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_rtt.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_shdwc.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_spi.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_ssc.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_st.h (97%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_tc.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_twi.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91_wdt.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91rm9200.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91rm9200_emac.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91rm9200_mc.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9260.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9260_matrix.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9261.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam9261_matrix.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/at91sam926x_mc.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/board.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/cpu.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/debug-macro.S (95%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/dma.h (94%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/entry-macro.S (94%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/gpio.h (99%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/hardware.h (98%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/io.h (95%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/irqs.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/memory.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/system.h (97%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/timex.h (96%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/uncompress.h (97%) rename include/asm-arm/{arch-at91rm9200 => arch-at91}/vmalloc.h (95%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6783c2e551..9c7565c8f3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -377,7 +377,7 @@ source "arch/arm/mach-aaec2000/Kconfig" source "arch/arm/mach-realview/Kconfig" -source "arch/arm/mach-at91rm9200/Kconfig" +source "arch/arm/mach-at91/Kconfig" source "arch/arm/mach-netx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 000f1100b5..0205547fa4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -124,7 +124,7 @@ endif machine-$(CONFIG_ARCH_H720X) := h720x machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 machine-$(CONFIG_ARCH_REALVIEW) := realview - machine-$(CONFIG_ARCH_AT91) := at91rm9200 + machine-$(CONFIG_ARCH_AT91) := at91 machine-$(CONFIG_ARCH_EP93XX) := ep93xx machine-$(CONFIG_ARCH_PNX4008) := pnx4008 machine-$(CONFIG_ARCH_NETX) := netx diff --git a/arch/arm/mach-at91rm9200/Kconfig b/arch/arm/mach-at91/Kconfig similarity index 100% rename from arch/arm/mach-at91rm9200/Kconfig rename to arch/arm/mach-at91/Kconfig diff --git a/arch/arm/mach-at91rm9200/Makefile b/arch/arm/mach-at91/Makefile similarity index 100% rename from arch/arm/mach-at91rm9200/Makefile rename to arch/arm/mach-at91/Makefile diff --git a/arch/arm/mach-at91rm9200/Makefile.boot b/arch/arm/mach-at91/Makefile.boot similarity index 100% rename from arch/arm/mach-at91rm9200/Makefile.boot rename to arch/arm/mach-at91/Makefile.boot diff --git a/arch/arm/mach-at91rm9200/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c similarity index 99% rename from arch/arm/mach-at91rm9200/at91rm9200.c rename to arch/arm/mach-at91/at91rm9200.c index a92e9a495b..870d4a4eb8 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-at91rm9200/at91rm9200.c + * arch/arm/mach-at91/at91rm9200.c * * Copyright (C) 2005 SAN People * diff --git a/arch/arm/mach-at91rm9200/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c similarity index 99% rename from arch/arm/mach-at91rm9200/at91rm9200_devices.c rename to arch/arm/mach-at91/at91rm9200_devices.c index 57fac7203f..a06498ccc8 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-at91rm9200/at91rm9200_devices.c + * arch/arm/mach-at91/at91rm9200_devices.c * * Copyright (C) 2005 Thibaut VARENE * Copyright (C) 2005 David Brownell diff --git a/arch/arm/mach-at91rm9200/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c similarity index 98% rename from arch/arm/mach-at91rm9200/at91rm9200_time.c rename to arch/arm/mach-at91/at91rm9200_time.c index b999e192a7..949199a244 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/at91rm9200_time.c + * linux/arch/arm/mach-at91/at91rm9200_time.c * * Copyright (C) 2003 SAN People * Copyright (C) 2003 ATMEL diff --git a/arch/arm/mach-at91rm9200/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c similarity index 99% rename from arch/arm/mach-at91rm9200/at91sam9260.c rename to arch/arm/mach-at91/at91sam9260.c index b14871adc3..ffc4c09447 100644 --- a/arch/arm/mach-at91rm9200/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-at91rm9200/at91sam9260.c + * arch/arm/mach-at91/at91sam9260.c * * Copyright (C) 2006 SAN People * diff --git a/arch/arm/mach-at91rm9200/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c similarity index 99% rename from arch/arm/mach-at91rm9200/at91sam9260_devices.c rename to arch/arm/mach-at91/at91sam9260_devices.c index f338f78eb9..4adff70b9b 100644 --- a/arch/arm/mach-at91rm9200/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-at91rm9200/at91sam9260_devices.c + * arch/arm/mach-at91/at91sam9260_devices.c * * Copyright (C) 2006 Atmel * diff --git a/arch/arm/mach-at91rm9200/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c similarity index 99% rename from arch/arm/mach-at91rm9200/at91sam9261.c rename to arch/arm/mach-at91/at91sam9261.c index d242bb885c..47e02ff7e8 100644 --- a/arch/arm/mach-at91rm9200/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-at91rm9200/at91sam9261.c + * arch/arm/mach-at91/at91sam9261.c * * Copyright (C) 2005 SAN People * diff --git a/arch/arm/mach-at91rm9200/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c similarity index 99% rename from arch/arm/mach-at91rm9200/at91sam9261_devices.c rename to arch/arm/mach-at91/at91sam9261_devices.c index ed1d79081b..3249de08d1 100644 --- a/arch/arm/mach-at91rm9200/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-at91rm9200/at91sam9261_devices.c + * arch/arm/mach-at91/at91sam9261_devices.c * * Copyright (C) 2005 Thibaut VARENE * Copyright (C) 2005 David Brownell diff --git a/arch/arm/mach-at91rm9200/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c similarity index 98% rename from arch/arm/mach-at91rm9200/at91sam926x_time.c rename to arch/arm/mach-at91/at91sam926x_time.c index 99df5f6ee4..59cbbe1e81 100644 --- a/arch/arm/mach-at91rm9200/at91sam926x_time.c +++ b/arch/arm/mach-at91/at91sam926x_time.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/at91sam926x_time.c + * linux/arch/arm/mach-at91/at91sam926x_time.c * * Copyright (C) 2005-2006 M. Amine SAYA, ATMEL Rousset, France * Revision 2005 M. Nicolas Diremdjian, ATMEL Rousset, France diff --git a/arch/arm/mach-at91rm9200/board-1arm.c b/arch/arm/mach-at91/board-1arm.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-1arm.c rename to arch/arm/mach-at91/board-1arm.c index 971c3e2d8e..2d3d4b6f7b 100644 --- a/arch/arm/mach-at91rm9200/board-1arm.c +++ b/arch/arm/mach-at91/board-1arm.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-1arm.c + * linux/arch/arm/mach-at91/board-1arm.c * * Copyright (C) 2005 SAN People * diff --git a/arch/arm/mach-at91rm9200/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-carmeva.c rename to arch/arm/mach-at91/board-carmeva.c index 654f037955..a0815322f6 100644 --- a/arch/arm/mach-at91rm9200/board-carmeva.c +++ b/arch/arm/mach-at91/board-carmeva.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-carmeva.c + * linux/arch/arm/mach-at91/board-carmeva.c * * Copyright (c) 2005 Peer Georgi * Conitec Datasystems diff --git a/arch/arm/mach-at91rm9200/board-csb337.c b/arch/arm/mach-at91/board-csb337.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-csb337.c rename to arch/arm/mach-at91/board-csb337.c index b8bb805260..45d6d9b8f5 100644 --- a/arch/arm/mach-at91rm9200/board-csb337.c +++ b/arch/arm/mach-at91/board-csb337.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-csb337.c + * linux/arch/arm/mach-at91/board-csb337.c * * Copyright (C) 2005 SAN People * diff --git a/arch/arm/mach-at91rm9200/board-csb637.c b/arch/arm/mach-at91/board-csb637.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-csb637.c rename to arch/arm/mach-at91/board-csb637.c index a29fa0e822..774609479c 100644 --- a/arch/arm/mach-at91rm9200/board-csb637.c +++ b/arch/arm/mach-at91/board-csb637.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-csb637.c + * linux/arch/arm/mach-at91/board-csb637.c * * Copyright (C) 2005 SAN People * diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91/board-dk.c similarity index 99% rename from arch/arm/mach-at91rm9200/board-dk.c rename to arch/arm/mach-at91/board-dk.c index 7522bf91bc..7401dbe1b4 100644 --- a/arch/arm/mach-at91rm9200/board-dk.c +++ b/arch/arm/mach-at91/board-dk.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-dk.c + * linux/arch/arm/mach-at91/board-dk.c * * Copyright (C) 2005 SAN People * diff --git a/arch/arm/mach-at91rm9200/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-eb9200.c rename to arch/arm/mach-at91/board-eb9200.c index 80b72cf726..56d5ef63e0 100644 --- a/arch/arm/mach-at91rm9200/board-eb9200.c +++ b/arch/arm/mach-at91/board-eb9200.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-eb9200.c + * linux/arch/arm/mach-at91/board-eb9200.c * * Copyright (C) 2005 SAN People, adapted for ATEB9200 from Embest * by Andrew Patrikalakis diff --git a/arch/arm/mach-at91rm9200/board-ek.c b/arch/arm/mach-at91/board-ek.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-ek.c rename to arch/arm/mach-at91/board-ek.c index c4fdb415f2..0f589dd7d1 100644 --- a/arch/arm/mach-at91rm9200/board-ek.c +++ b/arch/arm/mach-at91/board-ek.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-ek.c + * linux/arch/arm/mach-at91/board-ek.c * * Copyright (C) 2005 SAN People * diff --git a/arch/arm/mach-at91rm9200/board-kafa.c b/arch/arm/mach-at91/board-kafa.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-kafa.c rename to arch/arm/mach-at91/board-kafa.c index 6ef3c48798..c77d84ce9c 100644 --- a/arch/arm/mach-at91rm9200/board-kafa.c +++ b/arch/arm/mach-at91/board-kafa.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-kafa.c + * linux/arch/arm/mach-at91/board-kafa.c * * Copyright (C) 2006 Sperry-Sun * diff --git a/arch/arm/mach-at91rm9200/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-kb9202.c rename to arch/arm/mach-at91/board-kb9202.c index 759d819185..17e68f5efb 100644 --- a/arch/arm/mach-at91rm9200/board-kb9202.c +++ b/arch/arm/mach-at91/board-kb9202.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-kb9202.c + * linux/arch/arm/mach-at91/board-kb9202.c * * Copyright (c) 2005 kb_admin * KwikByte, Inc. diff --git a/arch/arm/mach-at91rm9200/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c similarity index 98% rename from arch/arm/mach-at91rm9200/board-sam9260ek.c rename to arch/arm/mach-at91/board-sam9260ek.c index 37c7a7d195..6ae272d224 100644 --- a/arch/arm/mach-at91rm9200/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-ek.c + * linux/arch/arm/mach-at91/board-ek.c * * Copyright (C) 2005 SAN People * Copyright (C) 2006 Atmel diff --git a/arch/arm/mach-at91rm9200/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c similarity index 99% rename from arch/arm/mach-at91rm9200/board-sam9261ek.c rename to arch/arm/mach-at91/board-sam9261ek.c index 30b490d888..25d626348e 100644 --- a/arch/arm/mach-at91rm9200/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/board-ek.c + * linux/arch/arm/mach-at91/board-ek.c * * Copyright (C) 2005 SAN People * Copyright (C) 2006 Atmel diff --git a/arch/arm/mach-at91rm9200/clock.c b/arch/arm/mach-at91/clock.c similarity index 99% rename from arch/arm/mach-at91rm9200/clock.c rename to arch/arm/mach-at91/clock.c index 4dee21fefe..baab095f6e 100644 --- a/arch/arm/mach-at91rm9200/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/clock.c + * linux/arch/arm/mach-at91/clock.c * * Copyright (C) 2005 David Brownell * Copyright (C) 2005 Ivan Kokshaysky diff --git a/arch/arm/mach-at91rm9200/clock.h b/arch/arm/mach-at91/clock.h similarity index 94% rename from arch/arm/mach-at91rm9200/clock.h rename to arch/arm/mach-at91/clock.h index b5c7a2eb2d..1ba3b95ff3 100644 --- a/arch/arm/mach-at91rm9200/clock.h +++ b/arch/arm/mach-at91/clock.h @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/clock.h + * linux/arch/arm/mach-at91/clock.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/arch/arm/mach-at91rm9200/generic.h b/arch/arm/mach-at91/generic.h similarity index 97% rename from arch/arm/mach-at91rm9200/generic.h rename to arch/arm/mach-at91/generic.h index 8c4d5a77d4..10ee37bf6d 100644 --- a/arch/arm/mach-at91rm9200/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/generic.h + * linux/arch/arm/mach-at91/generic.h * * Copyright (C) 2005 David Brownell * diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91/gpio.c similarity index 99% rename from arch/arm/mach-at91rm9200/gpio.c rename to arch/arm/mach-at91/gpio.c index af22659c8a..9b7495cd55 100644 --- a/arch/arm/mach-at91rm9200/gpio.c +++ b/arch/arm/mach-at91/gpio.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/gpio.c + * linux/arch/arm/mach-at91/gpio.c * * Copyright (C) 2005 HP Labs * diff --git a/arch/arm/mach-at91rm9200/irq.c b/arch/arm/mach-at91/irq.c similarity index 99% rename from arch/arm/mach-at91rm9200/irq.c rename to arch/arm/mach-at91/irq.c index 2148daafd2..78a5cdb746 100644 --- a/arch/arm/mach-at91rm9200/irq.c +++ b/arch/arm/mach-at91/irq.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91rm9200/irq.c + * linux/arch/arm/mach-at91/irq.c * * Copyright (C) 2004 SAN People * Copyright (C) 2004 ATMEL diff --git a/arch/arm/mach-at91rm9200/leds.c b/arch/arm/mach-at91/leds.c similarity index 100% rename from arch/arm/mach-at91rm9200/leds.c rename to arch/arm/mach-at91/leds.c diff --git a/arch/arm/mach-at91rm9200/pm.c b/arch/arm/mach-at91/pm.c similarity index 99% rename from arch/arm/mach-at91rm9200/pm.c rename to arch/arm/mach-at91/pm.c index 67aa5572a3..e095b1fe8d 100644 --- a/arch/arm/mach-at91rm9200/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-at91rm9200/pm.c + * arch/arm/mach-at91/pm.c * AT91 Power Management * * Copyright (C) 2005 David Brownell diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c index 3d0d109738..ecbd4a21e4 100644 --- a/arch/avr32/mach-at32ap/clock.c +++ b/arch/avr32/mach-at32ap/clock.c @@ -3,7 +3,7 @@ * * Copyright (C) 2006 Atmel Corporation * - * Based on arch/arm/mach-at91rm9200/clock.c + * Based on arch/arm/mach-at91/clock.c * Copyright (C) 2005 David Brownell * Copyright (C) 2005 Ivan Kokshaysky * diff --git a/arch/avr32/mach-at32ap/clock.h b/arch/avr32/mach-at32ap/clock.h index f953f044ba..bb8e1f2958 100644 --- a/arch/avr32/mach-at32ap/clock.h +++ b/arch/avr32/mach-at32ap/clock.h @@ -3,7 +3,7 @@ * * Copyright (C) 2006 Atmel Corporation * - * Based on arch/arm/mach-at91rm9200/clock.c + * Based on arch/arm/mach-at91/clock.c * Copyright (C) 2005 David Brownell * Copyright (C) 2005 Ivan Kokshaysky * diff --git a/include/asm-arm/arch-at91rm9200/at91_aic.h b/include/asm-arm/arch-at91/at91_aic.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91_aic.h rename to include/asm-arm/arch-at91/at91_aic.h index 267e69812e..df44c12a12 100644 --- a/include/asm-arm/arch-at91rm9200/at91_aic.h +++ b/include/asm-arm/arch-at91/at91_aic.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_aic.h + * include/asm-arm/arch-at91/at91_aic.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_dbgu.h b/include/asm-arm/arch-at91/at91_dbgu.h similarity index 97% rename from include/asm-arm/arch-at91rm9200/at91_dbgu.h rename to include/asm-arm/arch-at91/at91_dbgu.h index e4b8b27acf..1002a808ad 100644 --- a/include/asm-arm/arch-at91rm9200/at91_dbgu.h +++ b/include/asm-arm/arch-at91/at91_dbgu.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_dbgu.h + * include/asm-arm/arch-at91/at91_dbgu.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_ecc.h b/include/asm-arm/arch-at91/at91_ecc.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/at91_ecc.h rename to include/asm-arm/arch-at91/at91_ecc.h index 5c564ede5c..ff93df516d 100644 --- a/include/asm-arm/arch-at91rm9200/at91_ecc.h +++ b/include/asm-arm/arch-at91/at91_ecc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_ecc.h + * include/asm-arm/arch-at91/at91_ecc.h * * Error Corrected Code Controller (ECC) - System peripherals regsters. * Based on AT91SAM9260 datasheet revision B. diff --git a/include/asm-arm/arch-at91rm9200/at91_lcdc.h b/include/asm-arm/arch-at91/at91_lcdc.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91_lcdc.h rename to include/asm-arm/arch-at91/at91_lcdc.h index 9cbfcdd3c4..ab040a40d3 100644 --- a/include/asm-arm/arch-at91rm9200/at91_lcdc.h +++ b/include/asm-arm/arch-at91/at91_lcdc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_lcdc.h + * include/asm-arm/arch-at91/at91_lcdc.h * * LCD Controller (LCDC). * Based on AT91SAM9261 datasheet revision E. diff --git a/include/asm-arm/arch-at91rm9200/at91_mci.h b/include/asm-arm/arch-at91/at91_mci.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91_mci.h rename to include/asm-arm/arch-at91/at91_mci.h index 9a552cb743..40a9876b66 100644 --- a/include/asm-arm/arch-at91rm9200/at91_mci.h +++ b/include/asm-arm/arch-at91/at91_mci.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_mci.h + * include/asm-arm/arch-at91/at91_mci.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_pdc.h b/include/asm-arm/arch-at91/at91_pdc.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/at91_pdc.h rename to include/asm-arm/arch-at91/at91_pdc.h index 79d6e02fa4..a54adf52c6 100644 --- a/include/asm-arm/arch-at91rm9200/at91_pdc.h +++ b/include/asm-arm/arch-at91/at91_pdc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_pdc.h + * include/asm-arm/arch-at91/at91_pdc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_pio.h b/include/asm-arm/arch-at91/at91_pio.h similarity index 97% rename from include/asm-arm/arch-at91rm9200/at91_pio.h rename to include/asm-arm/arch-at91/at91_pio.h index 680eaa1f59..84c3866d30 100644 --- a/include/asm-arm/arch-at91rm9200/at91_pio.h +++ b/include/asm-arm/arch-at91/at91_pio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_pio.h + * include/asm-arm/arch-at91/at91_pio.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_pit.h b/include/asm-arm/arch-at91/at91_pit.h similarity index 95% rename from include/asm-arm/arch-at91rm9200/at91_pit.h rename to include/asm-arm/arch-at91/at91_pit.h index 4a30d009c5..5026325a5a 100644 --- a/include/asm-arm/arch-at91rm9200/at91_pit.h +++ b/include/asm-arm/arch-at91/at91_pit.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_pit.h + * include/asm-arm/arch-at91/at91_pit.h * * Periodic Interval Timer (PIT) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91rm9200/at91_pmc.h b/include/asm-arm/arch-at91/at91_pmc.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91_pmc.h rename to include/asm-arm/arch-at91/at91_pmc.h index c3b489d09b..33ff5b6798 100644 --- a/include/asm-arm/arch-at91rm9200/at91_pmc.h +++ b/include/asm-arm/arch-at91/at91_pmc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_pmc.h + * include/asm-arm/arch-at91/at91_pmc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_rstc.h b/include/asm-arm/arch-at91/at91_rstc.h similarity index 97% rename from include/asm-arm/arch-at91rm9200/at91_rstc.h rename to include/asm-arm/arch-at91/at91_rstc.h index 237d3c40b3..0b7afbc015 100644 --- a/include/asm-arm/arch-at91rm9200/at91_rstc.h +++ b/include/asm-arm/arch-at91/at91_rstc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_rstc.h + * include/asm-arm/arch-at91/at91_rstc.h * * Reset Controller (RSTC) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91rm9200/at91_rtc.h b/include/asm-arm/arch-at91/at91_rtc.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91_rtc.h rename to include/asm-arm/arch-at91/at91_rtc.h index 095fe08831..af9bd28174 100644 --- a/include/asm-arm/arch-at91rm9200/at91_rtc.h +++ b/include/asm-arm/arch-at91/at91_rtc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_rtc.h + * include/asm-arm/arch-at91/at91_rtc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_rtt.h b/include/asm-arm/arch-at91/at91_rtt.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/at91_rtt.h rename to include/asm-arm/arch-at91/at91_rtt.h index c6751ba3cc..bae1103fbb 100644 --- a/include/asm-arm/arch-at91rm9200/at91_rtt.h +++ b/include/asm-arm/arch-at91/at91_rtt.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_rtt.h + * include/asm-arm/arch-at91/at91_rtt.h * * Real-time Timer (RTT) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91rm9200/at91_shdwc.h b/include/asm-arm/arch-at91/at91_shdwc.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/at91_shdwc.h rename to include/asm-arm/arch-at91/at91_shdwc.h index 0439250553..795fcc2662 100644 --- a/include/asm-arm/arch-at91rm9200/at91_shdwc.h +++ b/include/asm-arm/arch-at91/at91_shdwc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_shdwc.h + * include/asm-arm/arch-at91/at91_shdwc.h * * Shutdown Controller (SHDWC) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91rm9200/at91_spi.h b/include/asm-arm/arch-at91/at91_spi.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91_spi.h rename to include/asm-arm/arch-at91/at91_spi.h index bec48ca89b..f9b9a84649 100644 --- a/include/asm-arm/arch-at91rm9200/at91_spi.h +++ b/include/asm-arm/arch-at91/at91_spi.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_spi.h + * include/asm-arm/arch-at91/at91_spi.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_ssc.h b/include/asm-arm/arch-at91/at91_ssc.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91_ssc.h rename to include/asm-arm/arch-at91/at91_ssc.h index 694bcaa8f7..0ecc73460b 100644 --- a/include/asm-arm/arch-at91rm9200/at91_ssc.h +++ b/include/asm-arm/arch-at91/at91_ssc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_ssc.h + * include/asm-arm/arch-at91/at91_ssc.h * * Copyright (C) SAN People * diff --git a/include/asm-arm/arch-at91rm9200/at91_st.h b/include/asm-arm/arch-at91/at91_st.h similarity index 97% rename from include/asm-arm/arch-at91rm9200/at91_st.h rename to include/asm-arm/arch-at91/at91_st.h index 2432ddfc6c..30446e2ea7 100644 --- a/include/asm-arm/arch-at91rm9200/at91_st.h +++ b/include/asm-arm/arch-at91/at91_st.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_st.h + * include/asm-arm/arch-at91/at91_st.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_tc.h b/include/asm-arm/arch-at91/at91_tc.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91_tc.h rename to include/asm-arm/arch-at91/at91_tc.h index 8d06eb078e..b85d3faeef 100644 --- a/include/asm-arm/arch-at91rm9200/at91_tc.h +++ b/include/asm-arm/arch-at91/at91_tc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_tc.h + * include/asm-arm/arch-at91/at91_tc.h * * Copyright (C) SAN People * diff --git a/include/asm-arm/arch-at91rm9200/at91_twi.h b/include/asm-arm/arch-at91/at91_twi.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91_twi.h rename to include/asm-arm/arch-at91/at91_twi.h index cda914f1e7..ca9a907334 100644 --- a/include/asm-arm/arch-at91rm9200/at91_twi.h +++ b/include/asm-arm/arch-at91/at91_twi.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_twi.h + * include/asm-arm/arch-at91/at91_twi.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91_wdt.h b/include/asm-arm/arch-at91/at91_wdt.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/at91_wdt.h rename to include/asm-arm/arch-at91/at91_wdt.h index ac63e77577..7251a344c7 100644 --- a/include/asm-arm/arch-at91rm9200/at91_wdt.h +++ b/include/asm-arm/arch-at91/at91_wdt.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_wdt.h + * include/asm-arm/arch-at91/at91_wdt.h * * Watchdog Timer (WDT) - System peripherals regsters. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91rm9200/at91rm9200.h b/include/asm-arm/arch-at91/at91rm9200.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91rm9200.h rename to include/asm-arm/arch-at91/at91rm9200.h index c569b6a21a..a12ac8ab2a 100644 --- a/include/asm-arm/arch-at91rm9200/at91rm9200.h +++ b/include/asm-arm/arch-at91/at91rm9200.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91rm9200.h + * include/asm-arm/arch-at91/at91rm9200.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91rm9200_emac.h b/include/asm-arm/arch-at91/at91rm9200_emac.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91rm9200_emac.h rename to include/asm-arm/arch-at91/at91rm9200_emac.h index fbc091e61e..0c417af5fe 100644 --- a/include/asm-arm/arch-at91rm9200/at91rm9200_emac.h +++ b/include/asm-arm/arch-at91/at91rm9200_emac.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91rm9200_emac.h + * include/asm-arm/arch-at91/at91rm9200_emac.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91rm9200_mc.h b/include/asm-arm/arch-at91/at91rm9200_mc.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91rm9200_mc.h rename to include/asm-arm/arch-at91/at91rm9200_mc.h index 0c0d81480b..24d012939c 100644 --- a/include/asm-arm/arch-at91rm9200/at91rm9200_mc.h +++ b/include/asm-arm/arch-at91/at91rm9200_mc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91rm9200_mc.h + * include/asm-arm/arch-at91/at91rm9200_mc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/include/asm-arm/arch-at91rm9200/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91sam9260.h rename to include/asm-arm/arch-at91/at91sam9260.h index 46f4dd65c0..73d93ae924 100644 --- a/include/asm-arm/arch-at91rm9200/at91sam9260.h +++ b/include/asm-arm/arch-at91/at91sam9260.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91sam9260.h + * include/asm-arm/arch-at91/at91sam9260.h * * (C) 2006 Andrew Victor * diff --git a/include/asm-arm/arch-at91rm9200/at91sam9260_matrix.h b/include/asm-arm/arch-at91/at91sam9260_matrix.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91sam9260_matrix.h rename to include/asm-arm/arch-at91/at91sam9260_matrix.h index 78f6b4917b..573e97a47d 100644 --- a/include/asm-arm/arch-at91rm9200/at91sam9260_matrix.h +++ b/include/asm-arm/arch-at91/at91sam9260_matrix.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91sam9260_matrix.h + * include/asm-arm/arch-at91/at91sam9260_matrix.h * * Memory Controllers (MATRIX, EBI) - System peripherals registers. * Based on AT91SAM9260 datasheet revision B. diff --git a/include/asm-arm/arch-at91rm9200/at91sam9261.h b/include/asm-arm/arch-at91/at91sam9261.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91sam9261.h rename to include/asm-arm/arch-at91/at91sam9261.h index 8d39672d5b..01b58ffe2e 100644 --- a/include/asm-arm/arch-at91rm9200/at91sam9261.h +++ b/include/asm-arm/arch-at91/at91sam9261.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91sam9261.h + * include/asm-arm/arch-at91/at91sam9261.h * * Copyright (C) SAN People * diff --git a/include/asm-arm/arch-at91rm9200/at91sam9261_matrix.h b/include/asm-arm/arch-at91/at91sam9261_matrix.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/at91sam9261_matrix.h rename to include/asm-arm/arch-at91/at91sam9261_matrix.h index ec88efabbe..6f072421be 100644 --- a/include/asm-arm/arch-at91rm9200/at91sam9261_matrix.h +++ b/include/asm-arm/arch-at91/at91sam9261_matrix.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91sam9261_matrix.h + * include/asm-arm/arch-at91/at91sam9261_matrix.h * * Memory Controllers (MATRIX, EBI) - System peripherals registers. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91rm9200/at91sam926x_mc.h b/include/asm-arm/arch-at91/at91sam926x_mc.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/at91sam926x_mc.h rename to include/asm-arm/arch-at91/at91sam926x_mc.h index 972e7531c7..355eee67eb 100644 --- a/include/asm-arm/arch-at91rm9200/at91sam926x_mc.h +++ b/include/asm-arm/arch-at91/at91sam926x_mc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91sam926x_mc.h + * include/asm-arm/arch-at91/at91sam926x_mc.h * * Memory Controllers (SMC, SDRAMC) - System peripherals registers. * Based on AT91SAM9261 datasheet revision D. diff --git a/include/asm-arm/arch-at91rm9200/board.h b/include/asm-arm/arch-at91/board.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/board.h rename to include/asm-arm/arch-at91/board.h index f3a974ba3b..bf1afd0081 100644 --- a/include/asm-arm/arch-at91rm9200/board.h +++ b/include/asm-arm/arch-at91/board.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/board.h + * include/asm-arm/arch-at91/board.h * * Copyright (C) 2005 HP Labs * diff --git a/include/asm-arm/arch-at91rm9200/cpu.h b/include/asm-arm/arch-at91/cpu.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/cpu.h rename to include/asm-arm/arch-at91/cpu.h index 6f8d09b086..762eb41aa6 100644 --- a/include/asm-arm/arch-at91rm9200/cpu.h +++ b/include/asm-arm/arch-at91/cpu.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/cpu.h + * include/asm-arm/arch-at91/cpu.h * * Copyright (C) 2006 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/debug-macro.S b/include/asm-arm/arch-at91/debug-macro.S similarity index 95% rename from include/asm-arm/arch-at91rm9200/debug-macro.S rename to include/asm-arm/arch-at91/debug-macro.S index 85cdadf266..20721ef1ed 100644 --- a/include/asm-arm/arch-at91rm9200/debug-macro.S +++ b/include/asm-arm/arch-at91/debug-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/debug-macro.S + * include/asm-arm/arch-at91/debug-macro.S * * Copyright (C) 2003-2005 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/dma.h b/include/asm-arm/arch-at91/dma.h similarity index 94% rename from include/asm-arm/arch-at91rm9200/dma.h rename to include/asm-arm/arch-at91/dma.h index 22c1dfdd8d..774565412b 100644 --- a/include/asm-arm/arch-at91rm9200/dma.h +++ b/include/asm-arm/arch-at91/dma.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/dma.h + * include/asm-arm/arch-at91/dma.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/entry-macro.S b/include/asm-arm/arch-at91/entry-macro.S similarity index 94% rename from include/asm-arm/arch-at91rm9200/entry-macro.S rename to include/asm-arm/arch-at91/entry-macro.S index 57248a7964..a6f33832a1 100644 --- a/include/asm-arm/arch-at91rm9200/entry-macro.S +++ b/include/asm-arm/arch-at91/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/entry-macro.S + * include/asm-arm/arch-at91/entry-macro.S * * Copyright (C) 2003-2005 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/gpio.h b/include/asm-arm/arch-at91/gpio.h similarity index 99% rename from include/asm-arm/arch-at91rm9200/gpio.h rename to include/asm-arm/arch-at91/gpio.h index a011d27876..6d1a5eb347 100644 --- a/include/asm-arm/arch-at91rm9200/gpio.h +++ b/include/asm-arm/arch-at91/gpio.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/gpio.h + * include/asm-arm/arch-at91/gpio.h * * Copyright (C) 2005 HP Labs * diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/include/asm-arm/arch-at91/hardware.h similarity index 98% rename from include/asm-arm/arch-at91rm9200/hardware.h rename to include/asm-arm/arch-at91/hardware.h index 9ea5bfe063..ccb7c7285b 100644 --- a/include/asm-arm/arch-at91rm9200/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/hardware.h + * include/asm-arm/arch-at91/hardware.h * * Copyright (C) 2003 SAN People * Copyright (C) 2003 ATMEL diff --git a/include/asm-arm/arch-at91rm9200/io.h b/include/asm-arm/arch-at91/io.h similarity index 95% rename from include/asm-arm/arch-at91rm9200/io.h rename to include/asm-arm/arch-at91/io.h index 88fd1bebce..401f327ec0 100644 --- a/include/asm-arm/arch-at91rm9200/io.h +++ b/include/asm-arm/arch-at91/io.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/io.h + * include/asm-arm/arch-at91/io.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/irqs.h b/include/asm-arm/arch-at91/irqs.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/irqs.h rename to include/asm-arm/arch-at91/irqs.h index c0679eaefa..f041c98c53 100644 --- a/include/asm-arm/arch-at91rm9200/irqs.h +++ b/include/asm-arm/arch-at91/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/irqs.h + * include/asm-arm/arch-at91/irqs.h * * Copyright (C) 2004 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/memory.h b/include/asm-arm/arch-at91/memory.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/memory.h rename to include/asm-arm/arch-at91/memory.h index f985069e6d..4835d67845 100644 --- a/include/asm-arm/arch-at91rm9200/memory.h +++ b/include/asm-arm/arch-at91/memory.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/memory.h + * include/asm-arm/arch-at91/memory.h * * Copyright (C) 2004 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/system.h b/include/asm-arm/arch-at91/system.h similarity index 97% rename from include/asm-arm/arch-at91rm9200/system.h rename to include/asm-arm/arch-at91/system.h index 9c67130603..6bf846098e 100644 --- a/include/asm-arm/arch-at91rm9200/system.h +++ b/include/asm-arm/arch-at91/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/system.h + * include/asm-arm/arch-at91/system.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/timex.h b/include/asm-arm/arch-at91/timex.h similarity index 96% rename from include/asm-arm/arch-at91rm9200/timex.h rename to include/asm-arm/arch-at91/timex.h index faeca45a8d..b24e364997 100644 --- a/include/asm-arm/arch-at91rm9200/timex.h +++ b/include/asm-arm/arch-at91/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/timex.h + * include/asm-arm/arch-at91/timex.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/uncompress.h b/include/asm-arm/arch-at91/uncompress.h similarity index 97% rename from include/asm-arm/arch-at91rm9200/uncompress.h rename to include/asm-arm/arch-at91/uncompress.h index 34b4b93fa0..a193d28304 100644 --- a/include/asm-arm/arch-at91rm9200/uncompress.h +++ b/include/asm-arm/arch-at91/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/uncompress.h + * include/asm-arm/arch-at91/uncompress.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-arm/arch-at91rm9200/vmalloc.h b/include/asm-arm/arch-at91/vmalloc.h similarity index 95% rename from include/asm-arm/arch-at91rm9200/vmalloc.h rename to include/asm-arm/arch-at91/vmalloc.h index 0a23b8c562..bb05e70e93 100644 --- a/include/asm-arm/arch-at91rm9200/vmalloc.h +++ b/include/asm-arm/arch-at91/vmalloc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/vmalloc.h + * include/asm-arm/arch-at91/vmalloc.h * * Copyright (C) 2003 SAN People * diff --git a/include/asm-avr32/arch-at32ap/at91_pdc.h b/include/asm-avr32/arch-at32ap/at91_pdc.h index 79d6e02fa4..a54adf52c6 100644 --- a/include/asm-avr32/arch-at32ap/at91_pdc.h +++ b/include/asm-avr32/arch-at32ap/at91_pdc.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-at91rm9200/at91_pdc.h + * include/asm-arm/arch-at91/at91_pdc.h * * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People -- 2.39.5