[U-Boot] [PATCH v3 13/19] ARM: at91: move SoC headers to mach-at91/include/mach

[Masahiro Yamada]

Move arch/arm/include/asm/arch-at91/*
  -> arch/arm/mach-at91/include/mach/*

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Acked-by: Andreas Bießmann <andreas.devel at googlemail.com>
---

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 <andreas.devel at googlemail.com>
 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 <sbabic at denx.de>
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
-- 
1.9.1