OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avr32: Use <mach/foo.h> instead of <asm/arch/foo.h> 

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>
This commit is contained in:
Haavard Skinnemoen 2008-08-05 13:57:38 +02:00
parent 964d219b6a
commit 3663b736a5
20 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/avr32/boards/atngw100/flash.c
View 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,

8
arch/avr32/boards/atngw100/setup.c
View File

@ -23,10 +23,10 @@
#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] = {

10
arch/avr32/boards/atstk1000/atstk1002.c
View File

@ -23,10 +23,10 @@
#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,

8
arch/avr32/boards/atstk1000/atstk1003.c
View File

@ -20,10 +20,10 @@
#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"

8
arch/avr32/boards/atstk1000/atstk1004.c
View File

@ -22,10 +22,10 @@
#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"

2
arch/avr32/boards/atstk1000/flash.c
View 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,

6
arch/avr32/boards/atstk1000/setup.c
View 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"

2
arch/avr32/include/asm/gpio.h
View 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 */

2
arch/avr32/include/asm/io.h
View 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)

2
arch/avr32/include/asm/irq.h
View 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)

2
arch/avr32/kernel/process.c
View 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);

4
arch/avr32/kernel/setup.c
View 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;

2
arch/avr32/kernel/time.c
View 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)

8
arch/avr32/mach-at32ap/at32ap700x.c
View File

@ -20,10 +20,10 @@
#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>

2
arch/avr32/mach-at32ap/hsmc.c
View 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"

2
arch/avr32/mach-at32ap/pio.c
View 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"

2
arch/avr32/mach-at32ap/pm-at32ap700x.S
View 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"

4
arch/avr32/mach-at32ap/pm.c
View 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

4
drivers/ata/pata_at32.c
View 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"

2
drivers/mmc/host/atmel-mci.c
View 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"