avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Tue, 5 Aug 2008 11:57:38 +0000 (13:57 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Tue, 5 Aug 2008 12:36:57 +0000 (14:36 +0200)
Update all avr32-specific files to use the new platform-specific header
locations. Drivers shared with ARM are left alone for now.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
20 files changed:
arch/avr32/boards/atngw100/flash.c
arch/avr32/boards/atngw100/setup.c
arch/avr32/boards/atstk1000/atstk1002.c
arch/avr32/boards/atstk1000/atstk1003.c
arch/avr32/boards/atstk1000/atstk1004.c
arch/avr32/boards/atstk1000/flash.c
arch/avr32/boards/atstk1000/setup.c
arch/avr32/include/asm/gpio.h
arch/avr32/include/asm/io.h
arch/avr32/include/asm/irq.h
arch/avr32/kernel/process.c
arch/avr32/kernel/setup.c
arch/avr32/kernel/time.c
arch/avr32/mach-at32ap/at32ap700x.c
arch/avr32/mach-at32ap/hsmc.c
arch/avr32/mach-at32ap/pio.c
arch/avr32/mach-at32ap/pm-at32ap700x.S
arch/avr32/mach-at32ap/pm.c
drivers/ata/pata_at32.c
drivers/mmc/host/atmel-mci.c

index b07ae63aa54802eaa47b700c009da90c83f31a9a..55ccc9ce489245cfb1a821d5eaa140ee22765f3a 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 
-#include <asm/arch/smc.h>
+#include <mach/smc.h>
 
 static struct smc_timing flash_timing __initdata = {
        .ncs_read_setup         = 0,
index c7fe94d03a1eb1358a2d77b2a663bc6a81fba757..670c87b2db121b5506901fce7b2c5d94055836f9 100644 (file)
 #include <asm/io.h>
 #include <asm/setup.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/board.h>
-#include <asm/arch/init.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/board.h>
+#include <mach/init.h>
+#include <mach/portmux.h>
 
 /* Oscillator frequencies. These are board-specific */
 unsigned long at32_board_osc_rates[3] = {
index 8538ba75ef92c8a1def6ee96caea4557618ae061..b33542b97563f3a1d156d6008e9b02b634ad4f81 100644 (file)
 #include <asm/setup.h>
 #include <asm/atmel-mci.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/board.h>
-#include <asm/arch/init.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/board.h>
+#include <mach/init.h>
+#include <mach/portmux.h>
 
 #include "atstk1000.h"
 
@@ -49,7 +49,7 @@ unsigned long at32_board_osc_rates[3] = {
  */
 #ifdef CONFIG_BOARD_ATSTK1006
 #include <linux/mtd/partitions.h>
-#include <asm/arch/smc.h>
+#include <mach/smc.h>
 
 static struct smc_timing nand_timing __initdata = {
        .ncs_read_setup         = 0,
index 591fc73b554a58dc5c71e56fdd5471030dd32c32..0cf664174c1766f129366aecce8a6321aeb77ce8 100644 (file)
 
 #include <asm/setup.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/board.h>
-#include <asm/arch/init.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/board.h>
+#include <mach/init.h>
+#include <mach/portmux.h>
 
 #include "atstk1000.h"
 
index d9c5e0a21256cf30cd7c9a031b27753ddd2f67d6..50a5273e5916ddc285d5be2e3604a3b3df6c76d7 100644 (file)
 
 #include <asm/setup.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/board.h>
-#include <asm/arch/init.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/board.h>
+#include <mach/init.h>
+#include <mach/portmux.h>
 
 #include "atstk1000.h"
 
index 3d0a102ad45ec1e8fd77ad4bd794b4d726a65888..6e4d561977ffc2849d21691e691d40207579984d 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 
-#include <asm/arch/smc.h>
+#include <mach/smc.h>
 
 static struct smc_timing flash_timing __initdata = {
        .ncs_read_setup         = 0,
index 8bedf93876a377050cdb491643edbb9da45114ae..2d6b560115d9fa19c250f52a0a6e7c27bea27e81 100644 (file)
@@ -18,9 +18,9 @@
 
 #include <asm/setup.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/board.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/board.h>
+#include <mach/portmux.h>
 
 #include "atstk1000.h"
 
index 19e8ccc77db38d40eadaea3c1d77e7a005b82388..b771f71059646c2f4ce46048297311566955683f 100644 (file)
@@ -1,6 +1,6 @@
 #ifndef __ASM_AVR32_GPIO_H
 #define __ASM_AVR32_GPIO_H
 
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #endif /* __ASM_AVR32_GPIO_H */
index 8be7ea9c9047119b3541cd8d7ec860c1dd763d73..a520f77ead96e62d02ee2197d85c2a76fa46c9e2 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
 
-#include <asm/arch/io.h>
+#include <mach/io.h>
 
 /* virt_to_phys will only work when address is in P1 or P2 */
 static __inline__ unsigned long virt_to_phys(volatile void *address)
index c563b7720c1ad7f8034100c64dd223e13e81d079..6fa8913f8548bd25117a0e656ac998695a002857 100644 (file)
@@ -3,7 +3,7 @@
 
 #define NR_INTERNAL_IRQS       64
 
-#include <asm/arch/irq.h>
+#include <mach/irq.h>
 
 #ifndef NR_IRQS
 #define NR_IRQS                        (NR_INTERNAL_IRQS)
index ff820a9e743a01c3d5fdd7bd61649fec474bdad3..2c08ac992ac3d8435c2284224cbbd5a0691ac085 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/sysreg.h>
 #include <asm/ocd.h>
 
-#include <asm/arch/pm.h>
+#include <mach/pm.h>
 
 void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
index ce48c14f4349cfd3f18a1544397fd37588c6b888..d8e623c426c1f324c37369eca13cf358e3b85ab1 100644 (file)
@@ -26,8 +26,8 @@
 #include <asm/setup.h>
 #include <asm/sysreg.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/init.h>
+#include <mach/board.h>
+#include <mach/init.h>
 
 extern int root_mountflags;
 
index 7e7f32771ae1aa9d0a25b38739cebc81352173a4..283481d74a5bf454e2b6966810df4133d70d5cfc 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <asm/sysreg.h>
 
-#include <asm/arch/pm.h>
+#include <mach/pm.h>
 
 
 static cycle_t read_cycle_count(void)
index 1617048c86c5955bb549d84be9d1bf77ca90c6af..92bfb4d8ae455ad82fd4d5cb2e16cc94122eea21 100644 (file)
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/board.h>
-#include <asm/arch/portmux.h>
-#include <asm/arch/sram.h>
+#include <mach/at32ap700x.h>
+#include <mach/board.h>
+#include <mach/portmux.h>
+#include <mach/sram.h>
 
 #include <video/atmel_lcdc.h>
 
index b2d9bc61a35ca1ca55572bf8aa6636ecde50f9cc..2875c11be95d5f232d2970e204695fbc83a526d3 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
-#include <asm/arch/smc.h>
+#include <mach/smc.h>
 
 #include "hsmc.h"
 
index 296294f8ed81c42a92963c7794f3a39897e9fa81..405ee6bad4ce59dd888448b100daba698cf12b0c 100644 (file)
@@ -17,7 +17,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 
-#include <asm/arch/portmux.h>
+#include <mach/portmux.h>
 
 #include "pio.h"
 
index 0a53ad314ff429a54bfcc16e48898cd523a82b38..5be4de65b209661edbaab3851f7283149c96dba0 100644 (file)
@@ -10,7 +10,7 @@
 #include <asm/asm.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
-#include <asm/arch/pm.h>
+#include <mach/pm.h>
 
 #include "pm.h"
 #include "sdramc.h"
index 0b764320135d73aa9319f928a05ffeada237c835..a0cbef54fc2a8e706878dd19777a0239c2c4d898 100644 (file)
@@ -14,8 +14,8 @@
 #include <asm/cacheflush.h>
 #include <asm/sysreg.h>
 
-#include <asm/arch/pm.h>
-#include <asm/arch/sram.h>
+#include <mach/pm.h>
+#include <mach/sram.h>
 
 /* FIXME: This is only valid for AP7000 */
 #define SDRAMC_BASE    0xfff03800
index 82fb6e2731690f11194fd286810c807b14795c3b..ab61095093b9ab09469db263a1a2ba062e198dcf 100644 (file)
@@ -24,8 +24,8 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/smc.h>
+#include <mach/board.h>
+#include <mach/smc.h>
 
 #define DRV_NAME "pata_at32"
 #define DRV_VERSION "0.0.3"
index 992b4beb757c6593f4a790a0a749fcac5af8d165..0bd06f5bd62ffa414439dcd3a4c382124832c779 100644 (file)
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/unaligned.h>
 
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #include "atmel-mci-regs.h"