diff options
| -rw-r--r-- | arch/avr32/Makefile | 7 | ||||
| -rw-r--r-- | arch/avr32/boards/atngw100/flash.c | 2 | ||||
| -rw-r--r-- | arch/avr32/boards/atngw100/setup.c | 8 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 10 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1003.c | 8 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1004.c | 8 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/flash.c | 2 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/setup.c | 6 | ||||
| -rw-r--r-- | arch/avr32/include/asm/Kbuild (renamed from include/asm-avr32/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/a.out.h (renamed from include/asm-avr32/a.out.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/addrspace.h (renamed from include/asm-avr32/addrspace.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/asm.h (renamed from include/asm-avr32/asm.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/atmel-mci.h (renamed from include/asm-avr32/atmel-mci.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/atomic.h (renamed from include/asm-avr32/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/auxvec.h (renamed from include/asm-avr32/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/bitops.h (renamed from include/asm-avr32/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/bug.h (renamed from include/asm-avr32/bug.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/bugs.h (renamed from include/asm-avr32/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/byteorder.h (renamed from include/asm-avr32/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/cache.h (renamed from include/asm-avr32/cache.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/cachectl.h (renamed from include/asm-avr32/cachectl.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/cacheflush.h (renamed from include/asm-avr32/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/checksum.h (renamed from include/asm-avr32/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/cputime.h (renamed from include/asm-avr32/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/current.h (renamed from include/asm-avr32/current.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/delay.h (renamed from include/asm-avr32/delay.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/device.h (renamed from include/asm-avr32/device.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/div64.h (renamed from include/asm-avr32/div64.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/dma-mapping.h (renamed from include/asm-avr32/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/dma.h (renamed from include/asm-avr32/dma.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/elf.h (renamed from include/asm-avr32/elf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/emergency-restart.h (renamed from include/asm-avr32/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/errno.h (renamed from include/asm-avr32/errno.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/fb.h (renamed from include/asm-avr32/fb.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/fcntl.h (renamed from include/asm-avr32/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/futex.h (renamed from include/asm-avr32/futex.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/gpio.h (renamed from include/asm-avr32/gpio.h) | 2 | ||||
| -rw-r--r-- | arch/avr32/include/asm/hardirq.h (renamed from include/asm-avr32/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/hw_irq.h (renamed from include/asm-avr32/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/io.h (renamed from include/asm-avr32/io.h) | 2 | ||||
| -rw-r--r-- | arch/avr32/include/asm/ioctl.h (renamed from include/asm-avr32/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/ioctls.h (renamed from include/asm-avr32/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/ipcbuf.h (renamed from include/asm-avr32/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/irq.h (renamed from include/asm-avr32/irq.h) | 2 | ||||
| -rw-r--r-- | arch/avr32/include/asm/irq_regs.h (renamed from include/asm-avr32/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/irqflags.h (renamed from include/asm-avr32/irqflags.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/kdebug.h (renamed from include/asm-avr32/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/kmap_types.h (renamed from include/asm-avr32/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/kprobes.h (renamed from include/asm-avr32/kprobes.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/linkage.h (renamed from include/asm-avr32/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/local.h (renamed from include/asm-avr32/local.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/mach/serial_at91.h (renamed from include/asm-avr32/mach/serial_at91.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/mman.h (renamed from include/asm-avr32/mman.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/mmu.h (renamed from include/asm-avr32/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/mmu_context.h (renamed from include/asm-avr32/mmu_context.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/module.h (renamed from include/asm-avr32/module.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/msgbuf.h (renamed from include/asm-avr32/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/mutex.h (renamed from include/asm-avr32/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/numnodes.h (renamed from include/asm-avr32/numnodes.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/ocd.h (renamed from include/asm-avr32/ocd.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/page.h (renamed from include/asm-avr32/page.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/param.h (renamed from include/asm-avr32/param.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/pci.h (renamed from include/asm-avr32/pci.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/percpu.h (renamed from include/asm-avr32/percpu.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/pgalloc.h (renamed from include/asm-avr32/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/pgtable-2level.h (renamed from include/asm-avr32/pgtable-2level.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/pgtable.h (renamed from include/asm-avr32/pgtable.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/poll.h (renamed from include/asm-avr32/poll.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/posix_types.h (renamed from include/asm-avr32/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/processor.h (renamed from include/asm-avr32/processor.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/ptrace.h (renamed from include/asm-avr32/ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/resource.h (renamed from include/asm-avr32/resource.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/scatterlist.h (renamed from include/asm-avr32/scatterlist.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/sections.h (renamed from include/asm-avr32/sections.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/sembuf.h (renamed from include/asm-avr32/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/serial.h (renamed from include/asm-avr32/serial.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/setup.h (renamed from include/asm-avr32/setup.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/shmbuf.h (renamed from include/asm-avr32/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/shmparam.h (renamed from include/asm-avr32/shmparam.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/sigcontext.h (renamed from include/asm-avr32/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/siginfo.h (renamed from include/asm-avr32/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/signal.h (renamed from include/asm-avr32/signal.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/socket.h (renamed from include/asm-avr32/socket.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/sockios.h (renamed from include/asm-avr32/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/stat.h (renamed from include/asm-avr32/stat.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/statfs.h (renamed from include/asm-avr32/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/string.h (renamed from include/asm-avr32/string.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/sysreg.h (renamed from include/asm-avr32/sysreg.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/system.h (renamed from include/asm-avr32/system.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/termbits.h (renamed from include/asm-avr32/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/termios.h (renamed from include/asm-avr32/termios.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/thread_info.h (renamed from include/asm-avr32/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/timex.h (renamed from include/asm-avr32/timex.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/tlb.h (renamed from include/asm-avr32/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/tlbflush.h (renamed from include/asm-avr32/tlbflush.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/topology.h (renamed from include/asm-avr32/topology.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/traps.h (renamed from include/asm-avr32/traps.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/types.h (renamed from include/asm-avr32/types.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/uaccess.h (renamed from include/asm-avr32/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/ucontext.h (renamed from include/asm-avr32/ucontext.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/unaligned.h (renamed from include/asm-avr32/unaligned.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/unistd.h (renamed from include/asm-avr32/unistd.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/user.h (renamed from include/asm-avr32/user.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/include/asm/xor.h (renamed from include/asm-avr32/xor.h) | 0 | ||||
| -rw-r--r-- | arch/avr32/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/avr32/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/avr32/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 8 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/hsmc.c | 2 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 49 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/board.h | 121 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/cpu.h | 35 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/gpio.h | 45 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/init.h | 18 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/io.h | 39 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/irq.h | 14 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/pm.h | 51 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/portmux.h | 29 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/smc.h | 113 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/sram.h | 30 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/pio.c | 2 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/pm-at32ap700x.S | 2 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/pm.c | 4 | ||||
| -rw-r--r-- | drivers/ata/pata_at32.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 2 |
125 files changed, 591 insertions, 42 deletions
diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile index 17a3529341d..5b46433d53a 100644 --- a/arch/avr32/Makefile +++ b/arch/avr32/Makefile @@ -23,9 +23,14 @@ KBUILD_AFLAGS += $(cpuflags-y) CHECKFLAGS += -D__avr32__ -D__BIG_ENDIAN +machine-$(CONFIG_PLATFORM_AT32AP) := at32ap +machdirs := $(patsubst %,arch/avr32/mach-%/, $(machine-y)) + +KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) + head-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/head.o head-y += arch/avr32/kernel/head.o -core-$(CONFIG_PLATFORM_AT32AP) += arch/avr32/mach-at32ap/ +core-y += $(machdirs) core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/ core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/ core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/ diff --git a/arch/avr32/boards/atngw100/flash.c b/arch/avr32/boards/atngw100/flash.c index b07ae63aa54..55ccc9ce489 100644 --- a/arch/avr32/boards/atngw100/flash.c +++ b/arch/avr32/boards/atngw100/flash.c @@ -13,7 +13,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> -#include <asm/arch/smc.h> +#include <mach/smc.h> |