avr32: rename memory-map.h -> hardware.h

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
2010-11-04 23:15:30 +00:00 · 2010-11-04 23:15:30 +00:00 · 5d73bc7af7
parent 535abb96fb
commit 5d73bc7af7
18 changed files with 17 additions and 17 deletions
--- a/arch/avr32/cpu/at32ap700x/clk.c
+++ b/arch/avr32/cpu/at32ap700x/clk.c
@ -24,7 +24,7 @@
 #include <asm/io.h>

 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/portmux.h>

 #include "sm.h"
--- a/arch/avr32/cpu/at32ap700x/portmux.c
+++ b/arch/avr32/cpu/at32ap700x/portmux.c
@ -24,7 +24,7 @@
 #include <asm/io.h>

 #include <asm/arch/chip-features.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/portmux.h>

 /*
--- a/arch/avr32/cpu/cpu.c
+++ b/arch/avr32/cpu/cpu.c
@ -27,7 +27,7 @@
 #include <asm/sysreg.h>

 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #include "hsmc3.h"

--- a/arch/avr32/cpu/hsdramc.c
+++ b/arch/avr32/cpu/hsdramc.c
@ -25,7 +25,7 @@
 #include <asm/sdram.h>

 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #include "hsdramc1.h"

--- a/arch/avr32/cpu/interrupts.c
+++ b/arch/avr32/cpu/interrupts.c
@ -27,7 +27,7 @@
 #include <asm/processor.h>
 #include <asm/sysreg.h>

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define HANDLER_MASK	0x00ffffff
 #define INTLEV_SHIFT	30
--- a/arch/avr32/cpu/portmux-gpio.c
+++ b/arch/avr32/cpu/portmux-gpio.c
@ -22,7 +22,7 @@
 #include <common.h>

 #include <asm/io.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>

 void portmux_select_peripheral(void *port, unsigned long pin_mask,
--- a/arch/avr32/cpu/portmux-pio.c
+++ b/arch/avr32/cpu/portmux-pio.c
@ -22,7 +22,7 @@
 #include <common.h>

 #include <asm/io.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>

 void portmux_select_peripheral(void *port, unsigned long pin_mask,
--- a/arch/avr32/include/asm/arch-at32ap700x/gpio.h
+++ b/arch/avr32/include/asm/arch-at32ap700x/gpio.h
@ -23,7 +23,7 @@
 #define __ASM_AVR32_ARCH_GPIO_H__

 #include <asm/arch/chip-features.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define NR_GPIO_CONTROLLERS	5

--- a/arch/avr32/include/asm/arch-at32ap700x/memory-map.h
+++ b/arch/avr32/include/asm/arch-at32ap700x/memory-map.h
--- a/board/miromico/hammerhead/hammerhead.c
+++ b/board/miromico/hammerhead/hammerhead.c
@ -29,7 +29,7 @@
 #include <asm/sdram.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hmatrix.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/mmu.h>
 #include <asm/arch/portmux.h>

--- a/drivers/mmc/atmel_mci.c
+++ b/drivers/mmc/atmel_mci.c
@ -28,7 +28,7 @@
 #include <asm/errno.h>
 #include <asm/byteorder.h>
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #include "atmel_mci.h"

--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@ -22,7 +22,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@ -24,7 +24,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>

 #define CONFIG_AVR32			1
 #define CONFIG_AT32AP			1