avr32: remove support for AVR32 architecture
authorHans-Christian Noren Egtvedt <egtvedt@samfundet.no>
Sun, 26 Feb 2017 11:56:39 +0000 (12:56 +0100)
committerHans-Christian Noren Egtvedt <egtvedt@samfundet.no>
Mon, 1 May 2017 07:27:15 +0000 (09:27 +0200)
This patch drops support for AVR32 architecture from the Linux kernel.

The AVR32 architecture is not keeping up with the development of the
kernel, and since it shares so much of the drivers with Atmel ARM SoC,
it is starting to hinder these drivers to develop swiftly.

Also, all AVR32 AP7 SoC processors are end of lifed from Atmel (now
Microchip).

Finally, the GCC toolchain is stuck at version 4.2.x, and has not
received any patches since the last release from Atmel;
4.2.4-atmel.1.1.3.avr32linux.1. When building kernel v4.10, this
toolchain is no longer able to properly link the network stack.

Haavard and I have came to the conclusion that we feel keeping AVR32 on
life support offers more obstacles for Atmel ARMs, than it gives joy to
AVR32 users. I also suspect there are very few AVR32 users left today,
if anybody at all.

Signed-off-by: Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Håvard Skinnemoen <hskinnemoen@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
226 files changed:
CREDITS
MAINTAINERS
arch/avr32/Kconfig [deleted file]
arch/avr32/Kconfig.debug [deleted file]
arch/avr32/Makefile [deleted file]
arch/avr32/boards/atngw100/Kconfig [deleted file]
arch/avr32/boards/atngw100/Kconfig_mrmt [deleted file]
arch/avr32/boards/atngw100/Makefile [deleted file]
arch/avr32/boards/atngw100/evklcd10x.c [deleted file]
arch/avr32/boards/atngw100/flash.c [deleted file]
arch/avr32/boards/atngw100/mrmt.c [deleted file]
arch/avr32/boards/atngw100/setup.c [deleted file]
arch/avr32/boards/atstk1000/Kconfig [deleted file]
arch/avr32/boards/atstk1000/Makefile [deleted file]
arch/avr32/boards/atstk1000/atstk1000.h [deleted file]
arch/avr32/boards/atstk1000/atstk1002.c [deleted file]
arch/avr32/boards/atstk1000/atstk1003.c [deleted file]
arch/avr32/boards/atstk1000/atstk1004.c [deleted file]
arch/avr32/boards/atstk1000/flash.c [deleted file]
arch/avr32/boards/atstk1000/setup.c [deleted file]
arch/avr32/boards/favr-32/Kconfig [deleted file]
arch/avr32/boards/favr-32/Makefile [deleted file]
arch/avr32/boards/favr-32/flash.c [deleted file]
arch/avr32/boards/favr-32/setup.c [deleted file]
arch/avr32/boards/hammerhead/Kconfig [deleted file]
arch/avr32/boards/hammerhead/Makefile [deleted file]
arch/avr32/boards/hammerhead/flash.c [deleted file]
arch/avr32/boards/hammerhead/flash.h [deleted file]
arch/avr32/boards/hammerhead/setup.c [deleted file]
arch/avr32/boards/merisc/Kconfig [deleted file]
arch/avr32/boards/merisc/Makefile [deleted file]
arch/avr32/boards/merisc/display.c [deleted file]
arch/avr32/boards/merisc/flash.c [deleted file]
arch/avr32/boards/merisc/merisc.h [deleted file]
arch/avr32/boards/merisc/merisc_sysfs.c [deleted file]
arch/avr32/boards/merisc/setup.c [deleted file]
arch/avr32/boards/mimc200/Makefile [deleted file]
arch/avr32/boards/mimc200/flash.c [deleted file]
arch/avr32/boards/mimc200/setup.c [deleted file]
arch/avr32/boot/images/.gitignore [deleted file]
arch/avr32/boot/images/Makefile [deleted file]
arch/avr32/boot/u-boot/Makefile [deleted file]
arch/avr32/boot/u-boot/empty.S [deleted file]
arch/avr32/boot/u-boot/head.S [deleted file]
arch/avr32/configs/atngw100_defconfig [deleted file]
arch/avr32/configs/atngw100_evklcd100_defconfig [deleted file]
arch/avr32/configs/atngw100_evklcd101_defconfig [deleted file]
arch/avr32/configs/atngw100_mrmt_defconfig [deleted file]
arch/avr32/configs/atngw100mkii_defconfig [deleted file]
arch/avr32/configs/atngw100mkii_evklcd100_defconfig [deleted file]
arch/avr32/configs/atngw100mkii_evklcd101_defconfig [deleted file]
arch/avr32/configs/atstk1002_defconfig [deleted file]
arch/avr32/configs/atstk1003_defconfig [deleted file]
arch/avr32/configs/atstk1004_defconfig [deleted file]
arch/avr32/configs/atstk1006_defconfig [deleted file]
arch/avr32/configs/favr-32_defconfig [deleted file]
arch/avr32/configs/hammerhead_defconfig [deleted file]
arch/avr32/configs/merisc_defconfig [deleted file]
arch/avr32/configs/mimc200_defconfig [deleted file]
arch/avr32/include/asm/Kbuild [deleted file]
arch/avr32/include/asm/addrspace.h [deleted file]
arch/avr32/include/asm/asm-offsets.h [deleted file]
arch/avr32/include/asm/asm.h [deleted file]
arch/avr32/include/asm/atomic.h [deleted file]
arch/avr32/include/asm/barrier.h [deleted file]
arch/avr32/include/asm/bitops.h [deleted file]
arch/avr32/include/asm/bug.h [deleted file]
arch/avr32/include/asm/bugs.h [deleted file]
arch/avr32/include/asm/cache.h [deleted file]
arch/avr32/include/asm/cacheflush.h [deleted file]
arch/avr32/include/asm/checksum.h [deleted file]
arch/avr32/include/asm/cmpxchg.h [deleted file]
arch/avr32/include/asm/current.h [deleted file]
arch/avr32/include/asm/dma-mapping.h [deleted file]
arch/avr32/include/asm/dma.h [deleted file]
arch/avr32/include/asm/elf.h [deleted file]
arch/avr32/include/asm/fb.h [deleted file]
arch/avr32/include/asm/ftrace.h [deleted file]
arch/avr32/include/asm/gpio.h [deleted file]
arch/avr32/include/asm/hardirq.h [deleted file]
arch/avr32/include/asm/hw_irq.h [deleted file]
arch/avr32/include/asm/io.h [deleted file]
arch/avr32/include/asm/irq.h [deleted file]
arch/avr32/include/asm/irqflags.h [deleted file]
arch/avr32/include/asm/kdebug.h [deleted file]
arch/avr32/include/asm/kmap_types.h [deleted file]
arch/avr32/include/asm/kprobes.h [deleted file]
arch/avr32/include/asm/linkage.h [deleted file]
arch/avr32/include/asm/mmu.h [deleted file]
arch/avr32/include/asm/mmu_context.h [deleted file]
arch/avr32/include/asm/module.h [deleted file]
arch/avr32/include/asm/ocd.h [deleted file]
arch/avr32/include/asm/page.h [deleted file]
arch/avr32/include/asm/pci.h [deleted file]
arch/avr32/include/asm/pgalloc.h [deleted file]
arch/avr32/include/asm/pgtable-2level.h [deleted file]
arch/avr32/include/asm/pgtable.h [deleted file]
arch/avr32/include/asm/processor.h [deleted file]
arch/avr32/include/asm/ptrace.h [deleted file]
arch/avr32/include/asm/serial.h [deleted file]
arch/avr32/include/asm/setup.h [deleted file]
arch/avr32/include/asm/shmparam.h [deleted file]
arch/avr32/include/asm/signal.h [deleted file]
arch/avr32/include/asm/string.h [deleted file]
arch/avr32/include/asm/switch_to.h [deleted file]
arch/avr32/include/asm/syscalls.h [deleted file]
arch/avr32/include/asm/sysreg.h [deleted file]
arch/avr32/include/asm/termios.h [deleted file]
arch/avr32/include/asm/thread_info.h [deleted file]
arch/avr32/include/asm/timex.h [deleted file]
arch/avr32/include/asm/tlb.h [deleted file]
arch/avr32/include/asm/tlbflush.h [deleted file]
arch/avr32/include/asm/traps.h [deleted file]
arch/avr32/include/asm/types.h [deleted file]
arch/avr32/include/asm/uaccess.h [deleted file]
arch/avr32/include/asm/ucontext.h [deleted file]
arch/avr32/include/asm/unaligned.h [deleted file]
arch/avr32/include/asm/unistd.h [deleted file]
arch/avr32/include/asm/user.h [deleted file]
arch/avr32/include/uapi/asm/Kbuild [deleted file]
arch/avr32/include/uapi/asm/auxvec.h [deleted file]
arch/avr32/include/uapi/asm/byteorder.h [deleted file]
arch/avr32/include/uapi/asm/cachectl.h [deleted file]
arch/avr32/include/uapi/asm/msgbuf.h [deleted file]
arch/avr32/include/uapi/asm/posix_types.h [deleted file]
arch/avr32/include/uapi/asm/ptrace.h [deleted file]
arch/avr32/include/uapi/asm/sembuf.h [deleted file]
arch/avr32/include/uapi/asm/setup.h [deleted file]
arch/avr32/include/uapi/asm/shmbuf.h [deleted file]
arch/avr32/include/uapi/asm/sigcontext.h [deleted file]
arch/avr32/include/uapi/asm/signal.h [deleted file]
arch/avr32/include/uapi/asm/socket.h [deleted file]
arch/avr32/include/uapi/asm/sockios.h [deleted file]
arch/avr32/include/uapi/asm/stat.h [deleted file]
arch/avr32/include/uapi/asm/swab.h [deleted file]
arch/avr32/include/uapi/asm/termbits.h [deleted file]
arch/avr32/include/uapi/asm/termios.h [deleted file]
arch/avr32/include/uapi/asm/types.h [deleted file]
arch/avr32/include/uapi/asm/unistd.h [deleted file]
arch/avr32/kernel/.gitignore [deleted file]
arch/avr32/kernel/Makefile [deleted file]
arch/avr32/kernel/asm-offsets.c [deleted file]
arch/avr32/kernel/avr32_ksyms.c [deleted file]
arch/avr32/kernel/cpu.c [deleted file]
arch/avr32/kernel/entry-avr32b.S [deleted file]
arch/avr32/kernel/head.S [deleted file]
arch/avr32/kernel/irq.c [deleted file]
arch/avr32/kernel/kprobes.c [deleted file]
arch/avr32/kernel/module.c [deleted file]
arch/avr32/kernel/nmi_debug.c [deleted file]
arch/avr32/kernel/ocd.c [deleted file]
arch/avr32/kernel/process.c [deleted file]
arch/avr32/kernel/ptrace.c [deleted file]
arch/avr32/kernel/setup.c [deleted file]
arch/avr32/kernel/signal.c [deleted file]
arch/avr32/kernel/stacktrace.c [deleted file]
arch/avr32/kernel/switch_to.S [deleted file]
arch/avr32/kernel/syscall-stubs.S [deleted file]
arch/avr32/kernel/syscall_table.S [deleted file]
arch/avr32/kernel/time.c [deleted file]
arch/avr32/kernel/traps.c [deleted file]
arch/avr32/kernel/vmlinux.lds.S [deleted file]
arch/avr32/lib/Makefile [deleted file]
arch/avr32/lib/__avr32_asr64.S [deleted file]
arch/avr32/lib/__avr32_lsl64.S [deleted file]
arch/avr32/lib/__avr32_lsr64.S [deleted file]
arch/avr32/lib/clear_user.S [deleted file]
arch/avr32/lib/copy_user.S [deleted file]
arch/avr32/lib/csum_partial.S [deleted file]
arch/avr32/lib/csum_partial_copy_generic.S [deleted file]
arch/avr32/lib/delay.c [deleted file]
arch/avr32/lib/findbit.S [deleted file]
arch/avr32/lib/io-readsb.S [deleted file]
arch/avr32/lib/io-readsl.S [deleted file]
arch/avr32/lib/io-readsw.S [deleted file]
arch/avr32/lib/io-writesb.S [deleted file]
arch/avr32/lib/io-writesl.S [deleted file]
arch/avr32/lib/io-writesw.S [deleted file]
arch/avr32/lib/memcpy.S [deleted file]
arch/avr32/lib/memset.S [deleted file]
arch/avr32/lib/strncpy_from_user.S [deleted file]
arch/avr32/lib/strnlen_user.S [deleted file]
arch/avr32/mach-at32ap/Kconfig [deleted file]
arch/avr32/mach-at32ap/Makefile [deleted file]
arch/avr32/mach-at32ap/at32ap700x.c [deleted file]
arch/avr32/mach-at32ap/clock.c [deleted file]
arch/avr32/mach-at32ap/clock.h [deleted file]
arch/avr32/mach-at32ap/extint.c [deleted file]
arch/avr32/mach-at32ap/hmatrix.c [deleted file]
arch/avr32/mach-at32ap/hsmc.c [deleted file]
arch/avr32/mach-at32ap/hsmc.h [deleted file]
arch/avr32/mach-at32ap/include/mach/at32ap700x.h [deleted file]
arch/avr32/mach-at32ap/include/mach/board.h [deleted file]
arch/avr32/mach-at32ap/include/mach/chip.h [deleted file]
arch/avr32/mach-at32ap/include/mach/cpu.h [deleted file]
arch/avr32/mach-at32ap/include/mach/gpio.h [deleted file]
arch/avr32/mach-at32ap/include/mach/hmatrix.h [deleted file]
arch/avr32/mach-at32ap/include/mach/init.h [deleted file]
arch/avr32/mach-at32ap/include/mach/io.h [deleted file]
arch/avr32/mach-at32ap/include/mach/irq.h [deleted file]
arch/avr32/mach-at32ap/include/mach/pm.h [deleted file]
arch/avr32/mach-at32ap/include/mach/portmux.h [deleted file]
arch/avr32/mach-at32ap/include/mach/smc.h [deleted file]
arch/avr32/mach-at32ap/include/mach/sram.h [deleted file]
arch/avr32/mach-at32ap/intc.c [deleted file]
arch/avr32/mach-at32ap/intc.h [deleted file]
arch/avr32/mach-at32ap/pdc.c [deleted file]
arch/avr32/mach-at32ap/pio.c [deleted file]
arch/avr32/mach-at32ap/pio.h [deleted file]
arch/avr32/mach-at32ap/pm-at32ap700x.S [deleted file]
arch/avr32/mach-at32ap/pm.c [deleted file]
arch/avr32/mach-at32ap/pm.h [deleted file]
arch/avr32/mach-at32ap/sdramc.h [deleted file]
arch/avr32/mm/Makefile [deleted file]
arch/avr32/mm/cache.c [deleted file]
arch/avr32/mm/clear_page.S [deleted file]
arch/avr32/mm/copy_page.S [deleted file]
arch/avr32/mm/dma-coherent.c [deleted file]
arch/avr32/mm/fault.c [deleted file]
arch/avr32/mm/init.c [deleted file]
arch/avr32/mm/ioremap.c [deleted file]
arch/avr32/mm/tlb.c [deleted file]
arch/avr32/oprofile/Makefile [deleted file]
arch/avr32/oprofile/backtrace.c [deleted file]
arch/avr32/oprofile/op_model_avr32.c [deleted file]
include/uapi/linux/elf-em.h

diff --git a/CREDITS b/CREDITS
index c5626bf06264e41e136fbe0c0420881e72de0ce2..5d09c26d69cdc0f4709cf48f5f3ff6195d53e85d 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1034,6 +1034,10 @@ S: 2037 Walnut #6
 S: Boulder, Colorado 80302
 S: USA
 
+N: Hans-Christian Noren Egtvedt
+E: egtvedt@samfundet.no
+D: AVR32 architecture maintainer.
+
 N: Heiko Eißfeldt
 E: heiko@colossus.escape.de heiko@unifix.de
 D: verify_area stuff, generic SCSI fixes
@@ -3398,6 +3402,10 @@ S: Suite 101
 S: Markham, Ontario L3R 2Z6
 S: Canada
 
+N: Haavard Skinnemoen
+M: Haavard Skinnemoen <hskinnemoen@gmail.com>
+D: AVR32 architecture port to Linux and maintainer.
+
 N: Rick Sladkey
 E: jrs@world.std.com
 D: utility hacker: Emacs, NFS server, mount, kmem-ps, UPS debugger, strace, GDB
index 38d3e4ed7208bb3969abcbfc76c4e68fd90d12f5..91c5fdbe56740428c3630059cdeedd298e0808f0 100644 (file)
@@ -2327,21 +2327,6 @@ S:       Maintained
 F:     drivers/auxdisplay/
 F:     include/linux/cfag12864b.h
 
-AVR32 ARCHITECTURE
-M:     Haavard Skinnemoen <hskinnemoen@gmail.com>
-M:     Hans-Christian Egtvedt <egtvedt@samfundet.no>
-W:     http://www.atmel.com/products/AVR32/
-W:     http://mirror.egtvedt.no/avr32linux.org/
-W:     http://avrfreaks.net/
-S:     Maintained
-F:     arch/avr32/
-
-AVR32/AT32AP MACHINE SUPPORT
-M:     Haavard Skinnemoen <hskinnemoen@gmail.com>
-M:     Hans-Christian Egtvedt <egtvedt@samfundet.no>
-S:     Maintained
-F:     arch/avr32/mach-at32ap/
-
 AX.25 NETWORK LAYER
 M:     Ralf Baechle <ralf@linux-mips.org>
 L:     linux-hams@vger.kernel.org
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
deleted file mode 100644 (file)
index 7e75d45..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-config AVR32
-       def_bool y
-       # With EXPERT=n, we get lots of stuff automatically selected
-       # that we usually don't need on AVR32.
-       select EXPERT
-       select HAVE_CLK
-       select HAVE_EXIT_THREAD
-       select HAVE_OPROFILE
-       select HAVE_KPROBES
-       select VIRT_TO_BUS
-       select GENERIC_IRQ_PROBE
-       select GENERIC_ATOMIC64
-       select HARDIRQS_SW_RESEND
-       select GENERIC_IRQ_SHOW
-       select ARCH_HAVE_CUSTOM_GPIO_H
-       select ARCH_WANT_IPC_PARSE_VERSION
-       select ARCH_HAVE_NMI_SAFE_CMPXCHG
-       select GENERIC_CLOCKEVENTS
-       select HAVE_MOD_ARCH_SPECIFIC
-       select MODULES_USE_ELF_RELA
-       select HAVE_NMI
-       help
-         AVR32 is a high-performance 32-bit RISC microprocessor core,
-         designed for cost-sensitive embedded applications, with particular
-         emphasis on low power consumption and high code density.
-
-         There is an AVR32 Linux project with a web page at
-         http://avr32linux.org/.
-
-config STACKTRACE_SUPPORT
-       def_bool y
-
-config LOCKDEP_SUPPORT
-       def_bool y
-
-config TRACE_IRQFLAGS_SUPPORT
-       def_bool y
-
-config RWSEM_GENERIC_SPINLOCK
-       def_bool y
-
-config RWSEM_XCHGADD_ALGORITHM
-       def_bool n
-
-config ARCH_HAS_ILOG2_U32
-       def_bool n
-
-config ARCH_HAS_ILOG2_U64
-       def_bool n
-
-config GENERIC_HWEIGHT
-       def_bool y
-
-config GENERIC_CALIBRATE_DELAY
-       def_bool y
-
-config GENERIC_BUG
-       def_bool y
-       depends on BUG
-
-source "init/Kconfig"
-
-source "kernel/Kconfig.freezer"
-
-menu "System Type and features"
-
-config SUBARCH_AVR32B
-       bool
-config MMU
-       bool
-config PERFORMANCE_COUNTERS
-       bool
-
-config PLATFORM_AT32AP
-       bool
-       select SUBARCH_AVR32B
-       select MMU
-       select PERFORMANCE_COUNTERS
-       select GPIOLIB
-       select GENERIC_ALLOCATOR
-       select HAVE_FB_ATMEL
-
-#
-# CPU types
-#
-
-# AP7000 derivatives
-config CPU_AT32AP700X
-       bool
-       select PLATFORM_AT32AP
-config CPU_AT32AP7000
-       bool
-       select CPU_AT32AP700X
-config CPU_AT32AP7001
-       bool
-       select CPU_AT32AP700X
-config CPU_AT32AP7002
-       bool
-       select CPU_AT32AP700X
-
-# AP700X boards
-config BOARD_ATNGW100_COMMON
-       bool
-       select CPU_AT32AP7000
-
-choice
-       prompt "AVR32 board type"
-       default BOARD_ATSTK1000
-
-config BOARD_ATSTK1000
-       bool "ATSTK1000 evaluation board"
-
-config BOARD_ATNGW100_MKI
-       bool "ATNGW100 Network Gateway"
-       select BOARD_ATNGW100_COMMON
-
-config BOARD_ATNGW100_MKII
-       bool "ATNGW100 mkII Network Gateway"
-       select BOARD_ATNGW100_COMMON
-
-config BOARD_HAMMERHEAD
-       bool "Hammerhead board"
-       select CPU_AT32AP7000
-       select USB_ARCH_HAS_HCD
-       help
-         The Hammerhead platform is built around an AVR32 32-bit microcontroller from Atmel.
-         It offers versatile peripherals, such as ethernet, usb device, usb host etc.
-
-         The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered
-         Device (PD).
-
-         Additionally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
-         mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which
-         will cover even the most exceptional need of memory bandwidth. Together with the onboard
-         video decoder the board is ready for video processing.
-
-         For more information see: http://www.miromico.ch/index.php/hammerhead.html 
-
-config BOARD_FAVR_32
-       bool "Favr-32 LCD-board"
-       select CPU_AT32AP7000
-
-config BOARD_MERISC
-       bool "Merisc board"
-       select CPU_AT32AP7000
-       help
-         Merisc is the family name for a range of AVR32-based boards.
-
-         The boards are designed to be used in a man-machine
-         interfacing environment, utilizing a touch-based graphical
-         user interface. They host a vast range of I/O peripherals as
-         well as a large SDRAM & Flash memory bank.
-
-         For more information see: http://www.martinsson.se/merisc
-
-config BOARD_MIMC200
-       bool "MIMC200 CPU board"
-       select CPU_AT32AP7000
-endchoice
-
-source "arch/avr32/boards/atstk1000/Kconfig"
-source "arch/avr32/boards/atngw100/Kconfig"
-source "arch/avr32/boards/hammerhead/Kconfig"
-source "arch/avr32/boards/favr-32/Kconfig"
-source "arch/avr32/boards/merisc/Kconfig"
-
-choice
-       prompt "Boot loader type"
-       default LOADER_U_BOOT
-
-config LOADER_U_BOOT
-       bool "U-Boot (or similar) bootloader"
-endchoice
-
-source "arch/avr32/mach-at32ap/Kconfig"
-
-config LOAD_ADDRESS
-       hex
-       default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y
-
-config ENTRY_ADDRESS
-       hex
-       default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y
-
-config PHYS_OFFSET
-       hex
-       default 0x10000000 if CPU_AT32AP700X=y
-
-source "kernel/Kconfig.preempt"
-
-config QUICKLIST
-       def_bool y
-
-config ARCH_HAVE_MEMORY_PRESENT
-       def_bool n
-
-config NEED_NODE_MEMMAP_SIZE
-       def_bool n
-
-config ARCH_FLATMEM_ENABLE
-       def_bool y
-
-config ARCH_DISCONTIGMEM_ENABLE
-       def_bool n
-
-config ARCH_SPARSEMEM_ENABLE
-       def_bool n
-
-config NODES_SHIFT
-       int
-       default "2"
-       depends on NEED_MULTIPLE_NODES
-
-source "mm/Kconfig"
-
-config OWNERSHIP_TRACE
-       bool "Ownership trace support"
-       default y
-       help
-         Say Y to generate an Ownership Trace message on every context switch,
-         enabling Nexus-compliant debuggers to keep track of the PID of the
-         currently executing task.
-
-config NMI_DEBUGGING
-       bool "NMI Debugging"
-       default n
-       help
-         Say Y here and pass the nmi_debug command-line parameter to
-         the kernel to turn on NMI debugging. Depending on the value
-         of the nmi_debug option, various pieces of information will
-         be dumped to the console when a Non-Maskable Interrupt
-         happens.
-
-# FPU emulation goes here
-
-source "kernel/Kconfig.hz"
-
-config CMDLINE
-       string "Default kernel command line"
-       default ""
-       help
-         If you don't have a boot loader capable of passing a command line string
-         to the kernel, you may specify one here. As a minimum, you should specify
-         the memory size and the root device (e.g., mem=8M, root=/dev/nfs).
-
-endmenu
-
-menu "Power management options"
-
-source "kernel/power/Kconfig"
-
-config ARCH_SUSPEND_POSSIBLE
-       def_bool y
-
-menu "CPU Frequency scaling"
-source "drivers/cpufreq/Kconfig"
-endmenu
-
-endmenu
-
-menu "Bus options"
-
-config PCI
-       bool
-
-source "drivers/pci/Kconfig"
-
-source "drivers/pcmcia/Kconfig"
-
-endmenu
-
-menu "Executable file formats"
-source "fs/Kconfig.binfmt"
-endmenu
-
-source "net/Kconfig"
-
-source "drivers/Kconfig"
-
-source "fs/Kconfig"
-
-source "arch/avr32/Kconfig.debug"
-
-source "security/Kconfig"
-
-source "crypto/Kconfig"
-
-source "lib/Kconfig"
diff --git a/arch/avr32/Kconfig.debug b/arch/avr32/Kconfig.debug
deleted file mode 100644 (file)
index 2283933..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-menu "Kernel hacking"
-
-config TRACE_IRQFLAGS_SUPPORT
-       bool
-       default y
-
-source "lib/Kconfig.debug"
-
-endmenu
diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile
deleted file mode 100644 (file)
index dba48a5..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 2004-2006 Atmel Corporation.
-
-# Default target when executing plain make
-.PHONY: all
-all: uImage vmlinux.elf
-
-KBUILD_DEFCONFIG       := atstk1002_defconfig
-
-KBUILD_CFLAGS  += -pipe -fno-builtin -mno-pic -D__linux__
-KBUILD_AFLAGS  += -mrelax -mno-pic
-KBUILD_CFLAGS_MODULE += -mno-relax
-LDFLAGS_vmlinux        += --relax
-
-cpuflags-$(CONFIG_PLATFORM_AT32AP)     += -march=ap
-
-KBUILD_CFLAGS  += $(cpuflags-y)
-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-y                                 += $(machdirs)
-core-$(CONFIG_BOARD_ATSTK1000)         += arch/avr32/boards/atstk1000/
-core-$(CONFIG_BOARD_ATNGW100_COMMON)   += arch/avr32/boards/atngw100/
-core-$(CONFIG_BOARD_HAMMERHEAD)                += arch/avr32/boards/hammerhead/
-core-$(CONFIG_BOARD_FAVR_32)           += arch/avr32/boards/favr-32/
-core-$(CONFIG_BOARD_MERISC)            += arch/avr32/boards/merisc/
-core-$(CONFIG_BOARD_MIMC200)           += arch/avr32/boards/mimc200/
-core-$(CONFIG_LOADER_U_BOOT)           += arch/avr32/boot/u-boot/
-core-y                                 += arch/avr32/kernel/
-core-y                                 += arch/avr32/mm/
-drivers-$(CONFIG_OPROFILE)             += arch/avr32/oprofile/
-libs-y                                 += arch/avr32/lib/
-
-BOOT_TARGETS := vmlinux.elf vmlinux.bin uImage uImage.srec
-
-.PHONY: $(BOOT_TARGETS) install
-
-boot := arch/$(ARCH)/boot/images
-
-             KBUILD_IMAGE := $(boot)/uImage
-vmlinux.elf: KBUILD_IMAGE := $(boot)/vmlinux.elf
-vmlinux.cso: KBUILD_IMAGE := $(boot)/vmlinux.cso
-uImage.srec: KBUILD_IMAGE := $(boot)/uImage.srec
-uImage:      KBUILD_IMAGE := $(boot)/uImage
-
-quiet_cmd_listing = LST     $@
-      cmd_listing = avr32-linux-objdump $(OBJDUMPFLAGS) -lS $< > $@
-quiet_cmd_disasm  = DIS     $@
-      cmd_disasm  = avr32-linux-objdump $(OBJDUMPFLAGS) -d $< > $@
-
-vmlinux.elf vmlinux.bin uImage.srec uImage vmlinux.cso: vmlinux
-       $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
-
-install: vmlinux
-       $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@
-
-vmlinux.s: vmlinux
-       $(call if_changed,disasm)
-
-vmlinux.lst: vmlinux
-       $(call if_changed,listing)
-
-CLEAN_FILES += vmlinux.s vmlinux.lst
-
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
-define archhelp
-  @echo '* vmlinux.elf         - ELF image with load address 0'
-  @echo '  vmlinux.cso         - PathFinder CSO image'
-  @echo '* uImage              - Create a bootable image for U-Boot'
-endef
diff --git a/arch/avr32/boards/atngw100/Kconfig b/arch/avr32/boards/atngw100/Kconfig
deleted file mode 100644 (file)
index 4e55617..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# NGW100 customization
-
-if BOARD_ATNGW100_COMMON
-
-config BOARD_ATNGW100_MKII_LCD
-       bool "Enable ATNGW100 mkII LCD interface"
-       depends on BOARD_ATNGW100_MKII
-       help
-         This enables the LCD controller (LCDC) in the AT32AP7000. Since the
-         LCDC is multiplexed with MACB1 (LAN) Ethernet port, only one can be
-         enabled at a time.
-
-         This choice enables the LCDC and disables the MACB1 interface marked
-         LAN on the PCB.
-
-choice
-       prompt "Select an NGW100 add-on board to support"
-       default BOARD_ATNGW100_ADDON_NONE
-
-config BOARD_ATNGW100_ADDON_NONE
-       bool "None"
-
-config BOARD_ATNGW100_EVKLCD10X
-       bool "EVKLCD10X addon board"
-       depends on BOARD_ATNGW100_MKI || BOARD_ATNGW100_MKII_LCD
-       help
-         This enables support for the EVKLCD100 (QVGA) or EVKLCD101 (VGA)
-         addon board for the NGW100 and NGW100 mkII. By enabling this the LCD
-         controller and AC97 controller is added as platform devices.
-
-config BOARD_ATNGW100_MRMT
-       bool "Mediama RMT1/2 add-on board"
-       help
-         This enables support for the Mediama RMT1 or RMT2 board.
-         RMT provides LCD support, AC97 codec and other
-         optional peripherals to the Atmel NGW100.
-
-         This choice disables the detect pin and the write-protect pin for the
-         MCI platform device, since it conflicts with the LCD platform device.
-         The MCI pins can be reenabled by editing the "add device function" but
-         this may break the setup for other displays that use these pins.
-
-endchoice
-
-choice
-       prompt "LCD panel resolution on EVKLCD10X"
-       depends on BOARD_ATNGW100_EVKLCD10X
-       default BOARD_ATNGW100_EVKLCD10X_VGA
-
-config BOARD_ATNGW100_EVKLCD10X_QVGA
-       bool "QVGA (320x240)"
-
-config BOARD_ATNGW100_EVKLCD10X_VGA
-       bool "VGA (640x480)"
-
-config BOARD_ATNGW100_EVKLCD10X_POW_QVGA
-       bool "Powertip QVGA (320x240)"
-
-endchoice
-
-if BOARD_ATNGW100_MRMT
-source "arch/avr32/boards/atngw100/Kconfig_mrmt"
-endif
-
-endif  # BOARD_ATNGW100_COMMON
diff --git a/arch/avr32/boards/atngw100/Kconfig_mrmt b/arch/avr32/boards/atngw100/Kconfig_mrmt
deleted file mode 100644 (file)
index 9a199a2..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# RMT for NGW100 customization
-
-choice
-       prompt "RMT Version"
-       help
-         Select the RMTx board version.
-
-config BOARD_MRMT_REV1
-       bool "RMT1"
-config BOARD_MRMT_REV2
-       bool "RMT2"
-
-endchoice
-
-config BOARD_MRMT_AC97
-       bool "Enable AC97 CODEC"
-       help
-         Enable the UCB1400 AC97 CODEC driver.
-
-choice
-       prompt "Touchscreen Driver"
-       default BOARD_MRMT_ADS7846_TS
-
-config BOARD_MRMT_UCB1400_TS
-       bool "Use UCB1400 Touchscreen"
-
-config BOARD_MRMT_ADS7846_TS
-       bool "Use ADS7846 Touchscreen"
-
-endchoice
-
-choice
-       prompt "RMTx LCD Selection"
-       default BOARD_MRMT_LCD_DISABLE
-
-config BOARD_MRMT_LCD_DISABLE
-       bool "LCD Disabled"
-
-config BOARD_MRMT_LCD_LQ043T3DX0X
-       bool "Sharp LQ043T3DX0x or compatible"
-       help
-         If using RMT2, be sure to load the resistor pack selectors accordingly
-
-if BOARD_MRMT_REV2
-config BOARD_MRMT_LCD_KWH043GM08
-       bool "Formike KWH043GM08 or compatible"
-       help
-         Be sure to load the RMT2 resistor pack selectors accordingly
-endif
-
-endchoice
-
-if !BOARD_MRMT_LCD_DISABLE
-config BOARD_MRMT_BL_PWM
-       bool "Use PWM control for LCD Backlight"
-       help
-               Use PWM driver for controlling LCD Backlight.
-               Otherwise, LCD Backlight is always on.
-endif
-
-config BOARD_MRMT_RTC_I2C
-       bool "Use External RTC on I2C Bus"
-       help
-               RMT1 has an optional RTC device on the I2C bus.
-               It is a SII S35390A.  Be sure to select the
-               matching RTC driver.
-
-choice
-       prompt "Wireless Module on ttyS2"
-       default BOARD_MRMT_WIRELESS_ZB
-
-config BOARD_MRMT_WIRELESS_ZB
-       bool "Use ZigBee/802.15.4 Module"
-
-config BOARD_MRMT_WIRELESS_BT
-       bool "Use Bluetooth (HCI) Module"
-
-config BOARD_MRMT_WIRELESS_NONE
-       bool "Not Installed"
-endchoice
diff --git a/arch/avr32/boards/atngw100/Makefile b/arch/avr32/boards/atngw100/Makefile
deleted file mode 100644 (file)
index f4ebe42..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y                                  += setup.o flash.o
-obj-$(CONFIG_BOARD_ATNGW100_EVKLCD10X) += evklcd10x.o
-obj-$(CONFIG_BOARD_ATNGW100_MRMT)      += mrmt.o
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c
deleted file mode 100644 (file)
index 64919b0..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Board-specific setup code for the ATEVKLCD10X addon board to the ATNGW100
- * Network Gateway
- *
- * Copyright (C) 2008 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-
-#include <linux/init.h>
-#include <linux/linkage.h>
-#include <linux/gpio.h>
-#include <linux/fb.h>
-#include <linux/platform_device.h>
-
-#include <video/atmel_lcdc.h>
-
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/portmux.h>
-#include <mach/board.h>
-
-#include <sound/atmel-ac97c.h>
-
-static struct ac97c_platform_data __initdata ac97c0_data = {
-       .reset_pin = GPIO_PIN_PB(19),
-};
-
-#ifdef CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA
-static struct fb_videomode __initdata tcg057vglad_modes[] = {
-       {
-               .name           = "640x480 @ 50",
-               .refresh        = 50,
-               .xres           = 640,          .yres           = 480,
-               .pixclock       = KHZ2PICOS(25180),
-
-               .left_margin    = 64,           .right_margin   = 96,
-               .upper_margin   = 34,           .lower_margin   = 11,
-               .hsync_len      = 64,           .vsync_len      = 15,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
-       .manufacturer           = "KYO",
-       .monitor                = "TCG057VGLAD",
-       .modedb                 = tcg057vglad_modes,
-       .modedb_len             = ARRAY_SIZE(tcg057vglad_modes),
-       .hfmin                  = 19948,
-       .hfmax                  = 31478,
-       .vfmin                  = 50,
-       .vfmax                  = 67,
-       .dclkmax                = 28330000,
-};
-
-static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
-       .default_bpp            = 16,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &atevklcd10x_default_monspecs,
-       .guard_time             = 2,
-};
-#elif CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA
-static struct fb_videomode __initdata tcg057qvlad_modes[] = {
-       {
-               .name           = "320x240 @ 50",
-               .refresh        = 50,
-               .xres           = 320,          .yres           = 240,
-               .pixclock       = KHZ2PICOS(6300),
-
-               .left_margin    = 34,           .right_margin   = 46,
-               .upper_margin   = 7,            .lower_margin   = 15,
-               .hsync_len      = 64,           .vsync_len      = 12,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
-       .manufacturer           = "KYO",
-       .monitor                = "TCG057QVLAD",
-       .modedb                 = tcg057qvlad_modes,
-       .modedb_len             = ARRAY_SIZE(tcg057qvlad_modes),
-       .hfmin                  = 19948,
-       .hfmax                  = 31478,
-       .vfmin                  = 50,
-       .vfmax                  = 67,
-       .dclkmax                = 7000000,
-};
-
-static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
-       .default_bpp            = 16,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &atevklcd10x_default_monspecs,
-       .guard_time             = 2,
-};
-#elif CONFIG_BOARD_ATNGW100_EVKLCD10X_POW_QVGA
-static struct fb_videomode __initdata ph320240t_modes[] = {
-       {
-               .name           = "320x240 @ 60",
-               .refresh        = 60,
-               .xres           = 320,          .yres           = 240,
-               .pixclock       = KHZ2PICOS(6300),
-
-               .left_margin    = 38,           .right_margin   = 20,
-               .upper_margin   = 15,           .lower_margin   = 5,
-               .hsync_len      = 30,           .vsync_len      = 3,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
-       .manufacturer           = "POW",
-       .monitor                = "PH320240T",
-       .modedb                 = ph320240t_modes,
-       .modedb_len             = ARRAY_SIZE(ph320240t_modes),
-       .hfmin                  = 14400,
-       .hfmax                  = 21600,
-       .vfmin                  = 50,
-       .vfmax                  = 90,
-       .dclkmax                = 6400000,
-};
-
-static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
-       .default_bpp            = 16,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &atevklcd10x_default_monspecs,
-       .guard_time             = 2,
-};
-#endif
-
-static void atevklcd10x_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
-{
-       gpio_set_value(GPIO_PIN_PB(15), on);
-}
-
-static int __init atevklcd10x_init(void)
-{
-       /* PB15 is connected to the enable line on the boost regulator
-        * controlling the backlight for the LCD panel.
-        */
-       at32_select_gpio(GPIO_PIN_PB(15), AT32_GPIOF_OUTPUT);
-       gpio_request(GPIO_PIN_PB(15), "backlight");
-       gpio_direction_output(GPIO_PIN_PB(15), 0);
-
-       atevklcd10x_lcdc_data.atmel_lcdfb_power_control =
-               atevklcd10x_lcdc_power_control;
-
-       at32_add_device_lcdc(0, &atevklcd10x_lcdc_data,
-                       fbmem_start, fbmem_size,
-#ifdef CONFIG_BOARD_ATNGW100_MKII
-                       ATMEL_LCDC_PRI_18BIT | ATMEL_LCDC_PC_DVAL
-#else
-                       ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL
-#endif
-                       );
-
-       at32_add_device_ac97c(0, &ac97c0_data, AC97C_BOTH);
-
-       return 0;
-}
-postcore_initcall(atevklcd10x_init);
diff --git a/arch/avr32/boards/atngw100/flash.c b/arch/avr32/boards/atngw100/flash.c
deleted file mode 100644 (file)
index 55ccc9c..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * ATNGW100 board-specific flash initialization
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <mach/smc.h>
-
-static struct smc_timing flash_timing __initdata = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 40,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 10,
-
-       .ncs_read_pulse         = 80,
-       .nrd_pulse              = 40,
-       .ncs_write_pulse        = 65,
-       .nwe_pulse              = 55,
-
-       .read_cycle             = 120,
-       .write_cycle            = 120,
-};
-
-static struct smc_config flash_config __initdata = {
-       .bus_width              = 2,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .byte_write             = 1,
-};
-
-static struct mtd_partition flash_parts[] = {
-       {
-               .name           = "u-boot",
-               .offset         = 0x00000000,
-               .size           = 0x00020000,           /* 128 KiB */
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "root",
-               .offset         = 0x00020000,
-               .size           = 0x007d0000,
-       },
-       {
-               .name           = "env",
-               .offset         = 0x007f0000,
-               .size           = 0x00010000,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-};
-
-static struct physmap_flash_data flash_data = {
-       .width          = 2,
-       .nr_parts       = ARRAY_SIZE(flash_parts),
-       .parts          = flash_parts,
-};
-
-static struct resource flash_resource = {
-       .start          = 0x00000000,
-       .end            = 0x007fffff,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = &flash_resource,
-       .num_resources  = 1,
-       .dev            = {
-               .platform_data = &flash_data,
-       },
-};
-
-/* This needs to be called after the SMC has been initialized */
-static int __init atngw100_flash_init(void)
-{
-       int ret;
-
-       smc_set_timing(&flash_config, &flash_timing);
-       ret = smc_set_configuration(0, &flash_config);
-       if (ret < 0) {
-               printk(KERN_ERR "atngw100: failed to set NOR flash timing\n");
-               return ret;
-       }
-
-       platform_device_register(&flash_device);
-
-       return 0;
-}
-device_initcall(atngw100_flash_init);
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c
deleted file mode 100644 (file)
index 99b0a79..0000000
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Board-specific setup code for Remote Media Terminal 1 (RMT1)
- * add-on board for the ATNGW100 Network Gateway
- *
- * Copyright (C) 2008 Mediama Technologies
- * Based on ATNGW100 Network Gateway (Copyright (C) Atmel)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/linkage.h>
-#include <linux/platform_device.h>
-#include <linux/types.h>
-#include <linux/fb.h>
-#include <linux/leds.h>
-#include <linux/pwm.h>
-#include <linux/leds_pwm.h>
-#include <linux/input.h>
-#include <linux/gpio_keys.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
-
-#include <video/atmel_lcdc.h>
-#include <sound/atmel-ac97c.h>
-
-#include <asm/delay.h>
-#include <asm/io.h>
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/board.h>
-#include <mach/init.h>
-#include <mach/portmux.h>
-
-/* Define board-specifoic GPIO assignments */
-#define PIN_LCD_BL     GPIO_PIN_PA(28)
-#define PWM_CH_BL      0       /* Must match with GPIO pin definition */
-#define PIN_LCD_DISP   GPIO_PIN_PA(31)
-#define        PIN_AC97_RST_N  GPIO_PIN_PA(30)
-#define PB_EXTINT_BASE 25
-#define TS_IRQ         0
-#define PIN_TS_EXTINT  GPIO_PIN_PB(PB_EXTINT_BASE+TS_IRQ)
-#define PIN_PB_LEFT    GPIO_PIN_PB(11)
-#define PIN_PB_RIGHT   GPIO_PIN_PB(12)
-#define PIN_PWR_SW_N   GPIO_PIN_PB(14)
-#define PIN_PWR_ON     GPIO_PIN_PB(13)
-#define PIN_ZB_RST_N   GPIO_PIN_PA(21)
-#define PIN_BT_RST     GPIO_PIN_PA(22)
-#define PIN_LED_SYS    GPIO_PIN_PA(16)
-#define PIN_LED_A      GPIO_PIN_PA(19)
-#define PIN_LED_B      GPIO_PIN_PE(19)
-
-#ifdef CONFIG_BOARD_MRMT_LCD_LQ043T3DX0X
-/* Sharp LQ043T3DX0x (or compatible) panel */
-static struct fb_videomode __initdata lcd_fb_modes[] = {
-       {
-               .name           = "480x272 @ 59.94Hz",
-               .refresh        = 59.94,
-               .xres           = 480,          .yres           = 272,
-               .pixclock       = KHZ2PICOS(9000),
-
-               .left_margin    = 2,            .right_margin   = 2,
-               .upper_margin   = 3,            .lower_margin   = 9,
-               .hsync_len      = 41,           .vsync_len      = 1,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata lcd_fb_default_monspecs = {
-       .manufacturer           = "SHA",
-       .monitor                = "LQ043T3DX02",
-       .modedb                 = lcd_fb_modes,
-       .modedb_len             = ARRAY_SIZE(lcd_fb_modes),
-       .hfmin                  = 14915,
-       .hfmax                  = 17638,
-       .vfmin                  = 53,
-       .vfmax                  = 61,
-       .dclkmax                = 9260000,
-};
-
-static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = {
-       .default_bpp            = 24,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_INVCLK_NORMAL
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .lcd_wiring_mode        = ATMEL_LCDC_WIRING_RGB,
-       .default_monspecs       = &lcd_fb_default_monspecs,
-       .guard_time             = 2,
-};
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_LCD_KWH043GM08
-/* Sharp KWH043GM08-Fxx (or compatible) panel */
-static struct fb_videomode __initdata lcd_fb_modes[] = {
-       {
-               .name           = "480x272 @ 59.94Hz",
-               .refresh        = 59.94,
-               .xres           = 480,          .yres           = 272,
-               .pixclock       = KHZ2PICOS(9000),
-
-               .left_margin    = 2,            .right_margin   = 2,
-               .upper_margin   = 3,            .lower_margin   = 9,
-               .hsync_len      = 41,           .vsync_len      = 1,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata lcd_fb_default_monspecs = {
-       .manufacturer           = "FOR",
-       .monitor                = "KWH043GM08",
-       .modedb                 = lcd_fb_modes,
-       .modedb_len             = ARRAY_SIZE(lcd_fb_modes),
-       .hfmin                  = 14915,
-       .hfmax                  = 17638,
-       .vfmin                  = 53,
-       .vfmax                  = 61,
-       .dclkmax                = 9260000,
-};
-
-static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = {
-       .default_bpp            = 24,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_INVCLK_INVERTED
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .lcd_wiring_mode        = ATMEL_LCDC_WIRING_RGB,
-       .default_monspecs       = &lcd_fb_default_monspecs,
-       .guard_time             = 2,
-};
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_AC97
-static struct ac97c_platform_data __initdata ac97c0_data = {
-       .reset_pin              = PIN_AC97_RST_N,
-};
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_UCB1400_TS
-/* NOTE: IRQ assignment relies on kernel module parameter */
-static struct platform_device rmt_ts_device = {
-       .name   = "ucb1400_ts",
-       .id     = -1,
-};
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_BL_PWM
-/* PWM LEDs: LCD Backlight, etc */
-static struct pwm_lookup pwm_lookup[] = {
-       PWM_LOOKUP("at91sam9rl-pwm", PWM_CH_BL, "leds_pwm", "ds1",
-                  5000, PWM_POLARITY_INVERSED),
-};
-
-static struct led_pwm pwm_leds[] = {
-       {
-               .name = "backlight",
-               .max_brightness = 255,
-       },
-};
-
-static struct led_pwm_platform_data pwm_data = {
-       .num_leds       = ARRAY_SIZE(pwm_leds),
-       .leds           = pwm_leds,
-};
-
-static struct platform_device leds_pwm = {
-       .name   = "leds_pwm",
-       .id     = -1,
-       .dev    = {
-               .platform_data = &pwm_data,
-       },
-};
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_ADS7846_TS
-static int ads7846_pendown_state(void)
-{
-       return !gpio_get_value( PIN_TS_EXTINT );        /* PENIRQ.*/
-}
-
-static struct ads7846_platform_data ads_info = {
-       .model                          = 7846,
-       .keep_vref_on                   = 0,    /* Use external VREF pin */
-       .vref_delay_usecs               = 0,
-       .vref_mv                        = 3300, /* VREF = 3.3V */
-       .settle_delay_usecs             = 800,
-       .penirq_recheck_delay_usecs     = 800,
-       .x_plate_ohms                   = 750,
-       .y_plate_ohms                   = 300,
-       .pressure_max                   = 4096,
-       .debounce_max                   = 1,
-       .debounce_rep                   = 0,
-       .debounce_tol                   = (~0),
-       .get_pendown_state              = ads7846_pendown_state,
-       .filter                         = NULL,
-       .filter_init                    = NULL,
-};
-
-static struct spi_board_info spi01_board_info[] __initdata = {
-       {
-               .modalias       = "ads7846",
-               .max_speed_hz   = 31250*26,
-               .bus_num        = 0,
-               .chip_select    = 1,
-               .platform_data  = &ads_info,
-               .irq            = AT32_EXTINT(TS_IRQ),
-       },
-};
-#endif
-
-/* GPIO Keys: left, right, power, etc */
-static const struct gpio_keys_button rmt_gpio_keys_buttons[] = {
-       [0] = {
-               .type           = EV_KEY,
-               .code           = KEY_POWER,
-               .gpio           = PIN_PWR_SW_N,
-               .active_low     = 1,
-               .desc           = "power button",
-       },
-       [1] = {
-               .type           = EV_KEY,
-               .code           = KEY_LEFT,
-               .gpio           = PIN_PB_LEFT,
-               .active_low     = 1,
-               .desc           = "left button",
-       },
-       [2] = {
-               .type           = EV_KEY,
-               .code           = KEY_RIGHT,
-               .gpio           = PIN_PB_RIGHT,
-               .active_low     = 1,
-               .desc           = "right button",
-       },
-};
-
-static const struct gpio_keys_platform_data rmt_gpio_keys_data = {
-       .nbuttons =     ARRAY_SIZE(rmt_gpio_keys_buttons),
-       .buttons =      (void *) rmt_gpio_keys_buttons,
-};
-
-static struct platform_device rmt_gpio_keys = {
-       .name =         "gpio-keys",
-       .id =           -1,
-       .dev = {
-               .platform_data = (void *) &rmt_gpio_keys_data,
-       }
-};
-
-#ifdef CONFIG_BOARD_MRMT_RTC_I2C
-static struct i2c_board_info __initdata mrmt1_i2c_rtc = {
-       I2C_BOARD_INFO("s35390a", 0x30),
-       .irq            = 0,
-};
-#endif
-
-static void mrmt_power_off(void)
-{
-       /* PWR_ON=0 will force power off */
-       gpio_set_value( PIN_PWR_ON, 0 );
-}
-
-static int __init mrmt1_init(void)
-{
-       gpio_set_value( PIN_PWR_ON, 1 );        /* Ensure PWR_ON is enabled */
-
-       pm_power_off = mrmt_power_off;
-
-       /* Setup USARTS (other than console) */
-       at32_map_usart(2, 1, 0);        /* USART 2: /dev/ttyS1, RMT1:DB9M */
-       at32_map_usart(3, 2, ATMEL_USART_RTS | ATMEL_USART_CTS);
-                       /* USART 3: /dev/ttyS2, RMT1:Wireless, w/ RTS/CTS */
-       at32_add_device_usart(1);
-       at32_add_device_usart(2);
-
-       /* Select GPIO Key pins */
-       at32_select_gpio( PIN_PWR_SW_N, AT32_GPIOF_DEGLITCH);
-       at32_select_gpio( PIN_PB_LEFT, AT32_GPIOF_DEGLITCH);
-       at32_select_gpio( PIN_PB_RIGHT, AT32_GPIOF_DEGLITCH);
-       platform_device_register(&rmt_gpio_keys);
-
-#ifdef CONFIG_BOARD_MRMT_RTC_I2C
-       i2c_register_board_info(0, &mrmt1_i2c_rtc, 1);
-#endif
-
-#ifndef CONFIG_BOARD_MRMT_LCD_DISABLE
-       /* User "alternate" LCDC inferface on Port E & D */
-       /* NB: exclude LCDC_CC pin, as NGW100 reserves it for other use */
-       at32_add_device_lcdc(0, &rmt_lcdc_data,
-               fbmem_start, fbmem_size,
-               (ATMEL_LCDC_ALT_24BIT | ATMEL_LCDC_PE_DVAL ) );
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_AC97
-       at32_add_device_ac97c(0, &ac97c0_data, AC97C_BOTH);
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_ADS7846_TS
-       /* Select the Touchscreen interrupt pin mode */
-       at32_select_periph( GPIO_PIOB_BASE, 1 << (PB_EXTINT_BASE+TS_IRQ),
-                       GPIO_PERIPH_A, AT32_GPIOF_DEGLITCH);
-       irq_set_irq_type(AT32_EXTINT(TS_IRQ), IRQ_TYPE_EDGE_FALLING);
-       at32_spi_setup_slaves(0,spi01_board_info,ARRAY_SIZE(spi01_board_info));
-       spi_register_board_info(spi01_board_info,ARRAY_SIZE(spi01_board_info));
-#endif
-
-#ifdef CONFIG_BOARD_MRMT_UCB1400_TS
-       /* Select the Touchscreen interrupt pin mode */
-       at32_select_periph( GPIO_PIOB_BASE, 1 << (PB_EXTINT_BASE+TS_IRQ),
-                       GPIO_PERIPH_A, AT32_GPIOF_DEGLITCH);
-       platform_device_register(&rmt_ts_device);
-#endif
-
-       at32_select_gpio( PIN_LCD_DISP, AT32_GPIOF_OUTPUT );
-       gpio_request( PIN_LCD_DISP, "LCD_DISP" );
-       gpio_direction_output( PIN_LCD_DISP, 0 );       /* LCD DISP */
-#ifdef CONFIG_BOARD_MRMT_LCD_DISABLE
-       /* Keep Backlight and DISP off */
-       at32_select_gpio( PIN_LCD_BL, AT32_GPIOF_OUTPUT );
-       gpio_request( PIN_LCD_BL, "LCD_BL" );
-       gpio_direction_output( PIN_LCD_BL, 0 );         /* Backlight */
-#else
-       gpio_set_value( PIN_LCD_DISP, 1 );      /* DISP asserted first */
-#ifdef CONFIG_BOARD_MRMT_BL_PWM
-       /* Use PWM for Backlight controls */
-       at32_add_device_pwm(1 << PWM_CH_BL);
-       pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
-       platform_device_register(&leds_pwm);
-#else
-       /* Backlight always on */
-       udelay( 1 );
-       at32_select_gpio( PIN_LCD_BL, AT32_GPIOF_OUTPUT );
-       gpio_request( PIN_LCD_BL, "LCD_BL" );
-       gpio_direction_output( PIN_LCD_BL, 1 );
-#endif
-#endif
-
-       /* Make sure BT and Zigbee modules in reset */
-       at32_select_gpio( PIN_BT_RST, AT32_GPIOF_OUTPUT );
-       gpio_request( PIN_BT_RST, "BT_RST" );
-       gpio_direction_output( PIN_BT_RST, 1 );
-       /* BT Module in Reset */
-
-       at32_select_gpio( PIN_ZB_RST_N, AT32_GPIOF_OUTPUT );
-       gpio_request( PIN_ZB_RST_N, "ZB_RST_N" );
-       gpio_direction_output( PIN_ZB_RST_N, 0 );
-       /* XBee Module in Reset */
-
-#ifdef CONFIG_BOARD_MRMT_WIRELESS_ZB
-       udelay( 1000 );
-       /* Unreset the XBee Module */
-       gpio_set_value( PIN_ZB_RST_N, 1 );
-#endif
-#ifdef CONFIG_BOARD_MRMT_WIRELESS_BT
-       udelay( 1000 );
-       /* Unreset the BT Module */
-       gpio_set_value( PIN_BT_RST, 0 );
-#endif
-
-       return 0;
-}
-arch_initcall(mrmt1_init);
-
-static int __init mrmt1_early_init(void)
-{
-       /* To maintain power-on signal in case boot loader did not already */
-       at32_select_gpio( PIN_PWR_ON, AT32_GPIOF_OUTPUT );
-       gpio_request( PIN_PWR_ON, "PIN_PWR_ON" );
-       gpio_direction_output( PIN_PWR_ON, 1 );
-
-       return 0;
-}
-core_initcall(mrmt1_early_init);
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
deleted file mode 100644 (file)
index afeae89..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Board-specific setup code for the ATNGW100 Network Gateway
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/clk.h>
-#include <linux/etherdevice.h>
-#include <linux/gpio.h>
-#include <linux/irq.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/init.h>
-#include <linux/linkage.h>
-#include <linux/platform_device.h>
-#include <linux/types.h>
-#include <linux/leds.h>
-#include <linux/spi/spi.h>
-#include <linux/atmel-mci.h>
-#include <linux/usb/atmel_usba_udc.h>
-
-#include <asm/io.h>
-#include <asm/setup.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] = {
-       [0] = 32768,    /* 32.768 kHz on RTC osc */
-       [1] = 20000000, /* 20 MHz on osc0 */
-       [2] = 12000000, /* 12 MHz on osc1 */
-};
-
-/*
- * The ATNGW100 mkII is very similar to the ATNGW100. Both have the AT32AP7000
- * chip on board; the difference is that the ATNGW100 mkII has 128 MB 32-bit
- * SDRAM (the ATNGW100 has 32 MB 16-bit SDRAM) and 256 MB 16-bit NAND flash
- * (the ATNGW100 has none.)
- *
- * The RAM difference is handled by the boot loader, so the only difference we
- * end up handling here is the NAND flash, EBI pin reservation and if LCDC or
- * MACB1 should be enabled.
- */
-#ifdef CONFIG_BOARD_ATNGW100_MKII
-#include <linux/mtd/partitions.h>
-#include <mach/smc.h>
-
-static struct smc_timing nand_timing __initdata = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 10,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 10,
-
-       .ncs_read_pulse         = 30,
-       .nrd_pulse              = 15,
-       .ncs_write_pulse        = 30,
-       .nwe_pulse              = 15,
-
-       .read_cycle             = 30,
-       .write_cycle            = 30,
-
-       .ncs_read_recover       = 0,
-       .nrd_recover            = 15,
-       .ncs_write_recover      = 0,
-       /* WE# high -> RE# low min 60 ns */
-       .nwe_recover            = 50,
-};
-
-static struct smc_config nand_config __initdata = {
-       .bus_width              = 2,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .nwait_mode             = 0,
-       .byte_write             = 0,
-       .tdf_cycles             = 2,
-       .tdf_mode               = 0,
-};
-
-static struct mtd_partition nand_partitions[] = {
-       {
-               .name           = "main",
-               .offset         = 0x00000000,
-               .size           = MTDPART_SIZ_FULL,
-       },
-};
-
-
-static struct atmel_nand_data atngw100mkii_nand_data __initdata = {
-       .cle            = 21,
-       .ale            = 22,
-       .rdy_pin        = GPIO_PIN_PB(28),
-       .enable_pin     = GPIO_PIN_PE(23),
-       .bus_width_16   = true,
-       .ecc_mode       = NAND_ECC_SOFT,
-       .parts          = nand_partitions,
-       .num_parts      = ARRAY_SIZE(nand_partitions),
-};
-#endif
-
-/* Initialized by bootloader-specific startup code. */
-struct tag *bootloader_tags __initdata;
-
-struct eth_addr {
-       u8 addr[6];
-};
-static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2];
-
-static struct spi_board_info spi0_board_info[] __initdata = {
-       {
-               .modalias       = "mtd_dataflash",
-               .max_speed_hz   = 8000000,
-               .chip_select    = 0,
-       },
-};
-
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-#if defined(CONFIG_BOARD_ATNGW100_MKII)
-               .detect_pin     = GPIO_PIN_PC(25),
-               .wp_pin         = GPIO_PIN_PE(22),
-#else
-               .detect_pin     = GPIO_PIN_PC(25),
-               .wp_pin         = GPIO_PIN_PE(0),
-#endif
-       },
-};
-
-static struct usba_platform_data atngw100_usba_data __initdata = {
-#if defined(CONFIG_BOARD_ATNGW100_MKII)
-       .vbus_pin       = GPIO_PIN_PE(26),
-#else
-       .vbus_pin       = -ENODEV,
-#endif
-};
-
-/*
- * The next two functions should go away as the boot loader is
- * supposed to initialize the macb address registers with a valid
- * ethernet address. But we need to keep it around for a while until
- * we can be reasonably sure the boot loader does this.
- *
- * The phy_id is ignored as the driver will probe for it.
- */
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-       int i;
-
-       i = tag->u.ethernet.mac_index;
-       if (i < ARRAY_SIZE(hw_addr))
-               memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
-                      sizeof(hw_addr[i].addr));
-
-       return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
-static void __init set_hw_addr(struct platform_device *pdev)
-{
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       const u8 *addr;
-       void __iomem *regs;
-       struct clk *pclk;
-
-       if (!res)
-               return;
-       if (pdev->id >= ARRAY_SIZE(hw_addr))
-               return;
-
-       addr = hw_addr[pdev->id].addr;
-       if (!is_valid_ether_addr(addr))
-               return;
-
-       /*
-        * Since this is board-specific code, we'll cheat and use the
-        * physical address directly as we happen to know that it's
-        * the same as the virtual address.
-        */
-       regs = (void __iomem __force *)res->start;
-       pclk = clk_get(&pdev->dev, "pclk");
-       if (IS_ERR(pclk))
-               return;
-
-       clk_enable(pclk);
-       __raw_writel((addr[3] << 24) | (addr[2] << 16)
-                    | (addr[1] << 8) | addr[0], regs + 0x98);
-       __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
-       clk_disable(pclk);
-       clk_put(pclk);
-}
-
-void __init setup_board(void)
-{
-       at32_map_usart(1, 0, 0);        /* USART 1: /dev/ttyS0, DB9 */
-       at32_setup_serial_console(0);
-}
-
-static const struct gpio_led ngw_leds[] = {
-       { .name = "sys", .gpio = GPIO_PIN_PA(16), .active_low = 1,
-               .default_trigger = "heartbeat",
-       },
-       { .name = "a", .gpio = GPIO_PIN_PA(19), .active_low = 1, },
-       { .name = "b", .gpio = GPIO_PIN_PE(19), .active_low = 1, },
-};
-
-static const struct gpio_led_platform_data ngw_led_data = {
-       .num_leds =     ARRAY_SIZE(ngw_leds),
-       .leds =         (void *) ngw_leds,
-};
-
-static struct platform_device ngw_gpio_leds = {
-       .name =         "leds-gpio",
-       .id =           -1,
-       .dev = {
-               .platform_data = (void *) &ngw_led_data,
-       }
-};
-
-static struct i2c_gpio_platform_data i2c_gpio_data = {
-       .sda_pin                = GPIO_PIN_PA(6),
-       .scl_pin                = GPIO_PIN_PA(7),
-       .sda_is_open_drain      = 1,
-       .scl_is_open_drain      = 1,
-       .udelay                 = 2,    /* close to 100 kHz */
-};
-
-static struct platform_device i2c_gpio_device = {
-       .name           = "i2c-gpio",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &i2c_gpio_data,
-       },
-};
-
-static struct i2c_board_info __initdata i2c_info[] = {
-       /* NOTE:  original ATtiny24 firmware is at address 0x0b */
-};
-
-static int __init atngw100_init(void)
-{
-       unsigned        i;
-
-       /*
-        * ATNGW100 mkII uses 32-bit SDRAM interface. Reserve the
-        * SDRAM-specific pins so that nobody messes with them.
-        */
-#ifdef CONFIG_BOARD_ATNGW100_MKII
-       at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
-
-       smc_set_timing(&nand_config, &nand_timing);
-       smc_set_configuration(3, &nand_config);
-       at32_add_device_nand(0, &atngw100mkii_nand_data);
-#endif
-
-       at32_add_device_usart(0);
-
-       set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
-#ifndef CONFIG_BOARD_ATNGW100_MKII_LCD
-       set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
-#endif
-
-       at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
-       at32_add_device_mci(0, &mci0_data);
-       at32_add_device_usba(0, &atngw100_usba_data);
-
-       for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
-               at32_select_gpio(ngw_leds[i].gpio,
-                               AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
-       }
-       platform_device_register(&ngw_gpio_leds);
-
-       /* all these i2c/smbus pins should have external pullups for
-        * open-drain sharing among all I2C devices.  SDA and SCL do;
-        * PB28/EXTINT3 (ATNGW100) and PE21 (ATNGW100 mkII) doesn't; it should
-        * be SMBALERT# (for PMBus), but it's not available off-board.
-        */
-#ifdef CONFIG_BOARD_ATNGW100_MKII
-       at32_select_periph(GPIO_PIOE_BASE, 1 << 21, 0, AT32_GPIOF_PULLUP);
-#else
-       at32_select_periph(GPIO_PIOB_BASE, 1 << 28, 0, AT32_GPIOF_PULLUP);
-#endif
-       at32_select_gpio(i2c_gpio_data.sda_pin,
-               AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
-       at32_select_gpio(i2c_gpio_data.scl_pin,
-               AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
-       platform_device_register(&i2c_gpio_device);
-       i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
-
-       return 0;
-}
-postcore_initcall(atngw100_init);
-
-static int __init atngw100_arch_init(void)
-{
-       /* PB30 (ATNGW100) and PE30 (ATNGW100 mkII) is the otherwise unused
-        * jumper on the mainboard, with an external pullup; the jumper grounds
-        * it. Use it however you like, including letting U-Boot or Linux tweak
-        * boot sequences.
-        */
-#ifdef CONFIG_BOARD_ATNGW100_MKII
-       at32_select_gpio(GPIO_PIN_PE(30), 0);
-       gpio_request(GPIO_PIN_PE(30), "j15");
-       gpio_direction_input(GPIO_PIN_PE(30));
-       gpio_export(GPIO_PIN_PE(30), false);
-#else
-       at32_select_gpio(GPIO_PIN_PB(30), 0);
-       gpio_request(GPIO_PIN_PB(30), "j15");
-       gpio_direction_input(GPIO_PIN_PB(30));
-       gpio_export(GPIO_PIN_PB(30), false);
-#endif
-
-       /* set_irq_type() after the arch_initcall for EIC has run, and
-        * before the I2C subsystem could try using this IRQ.
-        */
-       return irq_set_irq_type(AT32_EXTINT(3), IRQ_TYPE_EDGE_FALLING);
-}
-arch_initcall(atngw100_arch_init);
diff --git a/arch/avr32/boards/atstk1000/Kconfig b/arch/avr32/boards/atstk1000/Kconfig
deleted file mode 100644 (file)
index 8dc4821..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-# STK1000 customization
-
-if BOARD_ATSTK1000
-
-choice
-       prompt "ATSTK1000 CPU daughterboard type"
-       default BOARD_ATSTK1002
-
-config BOARD_ATSTK1002
-       bool "ATSTK1002"
-       select CPU_AT32AP7000
-
-config BOARD_ATSTK1003
-       bool "ATSTK1003"
-       select CPU_AT32AP7001
-
-config BOARD_ATSTK1004
-       bool "ATSTK1004"
-       select CPU_AT32AP7002
-
-config BOARD_ATSTK1006
-       bool "ATSTK1006"
-       select CPU_AT32AP7000
-
-endchoice
-
-
-config BOARD_ATSTK100X_CUSTOM
-       bool "Non-default STK1002/STK1003/STK1004 jumper settings"
-       help
-         You will normally leave the jumpers on the CPU card at their
-         default settings.  If you need to use certain peripherals,
-         you will need to change some of those jumpers.
-
-if BOARD_ATSTK100X_CUSTOM
-
-config BOARD_ATSTK100X_SW1_CUSTOM
-       bool "SW1: use SSC1 (not SPI0)"
-       help
-         This also prevents using the external DAC as an audio interface,
-         and means you can't initialize the on-board QVGA display.
-
-config BOARD_ATSTK100X_SW2_CUSTOM
-       bool "SW2: use IRDA or TIMER0 (not UART-A, MMC/SD, and PS2-A)"
-       help
-         If you change this you'll want an updated boot loader putting
-         the console on UART-C not UART-A.
-
-config BOARD_ATSTK100X_SW3_CUSTOM
-       bool "SW3: use TIMER1 (not SSC0 and GCLK)"
-       help
-         This also prevents using the external DAC as an audio interface.
-
-config BOARD_ATSTK100X_SW4_CUSTOM
-       bool "SW4: use ISI/Camera (not GPIOs, SPI1, and PS2-B)"
-       help
-         To use the camera interface you'll need a custom card (on the
-         PCI-format connector) connect a video sensor.
-
-config BOARD_ATSTK1002_SW5_CUSTOM
-       bool "SW5: use MACB1 (not LCDC)"
-       depends on BOARD_ATSTK1002
-
-config BOARD_ATSTK1002_SW6_CUSTOM
-       bool "SW6: more GPIOs (not MACB0)"
-       depends on BOARD_ATSTK1002
-
-endif  # custom
-
-config BOARD_ATSTK100X_SPI1
-       bool "Configure SPI1 controller"
-       depends on !BOARD_ATSTK100X_SW4_CUSTOM
-       help
-         All the signals for the second SPI controller are available on
-         GPIO lines and accessed through the J1 jumper block.  Say "y"
-         here to configure that SPI controller.
-
-config BOARD_ATSTK1000_J2_LED
-       bool
-       default BOARD_ATSTK1000_J2_LED8 || BOARD_ATSTK1000_J2_RGB
-
-choice
-       prompt "LEDs connected to J2:"
-       depends on LEDS_GPIO && !BOARD_ATSTK100X_SW4_CUSTOM
-       optional
-       help
-         Select this if you have jumpered the J2 jumper block to the
-         LED0..LED7 amber leds, or to the RGB leds, using a ten-pin
-         IDC cable.  A default "heartbeat" trigger is provided, but
-         you can of course override this.
-
-config BOARD_ATSTK1000_J2_LED8
-       bool "LED0..LED7"
-       help
-         Select this if J2 is jumpered to LED0..LED7 amber leds.
-
-config BOARD_ATSTK1000_J2_RGB
-       bool "RGB leds"
-       help
-         Select this if J2 is jumpered to the RGB leds.
-
-endchoice
-
-config BOARD_ATSTK1000_EXTDAC
-       bool
-       depends on !BOARD_ATSTK100X_SW1_CUSTOM && !BOARD_ATSTK100X_SW3_CUSTOM
-       default y
-
-endif  # stk 1000
diff --git a/arch/avr32/boards/atstk1000/Makefile b/arch/avr32/boards/atstk1000/Makefile
deleted file mode 100644 (file)
index edecee0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-y                          += setup.o flash.o
-obj-$(CONFIG_BOARD_ATSTK1002)  += atstk1002.o
-obj-$(CONFIG_BOARD_ATSTK1003)  += atstk1003.o
-obj-$(CONFIG_BOARD_ATSTK1004)  += atstk1004.o
-obj-$(CONFIG_BOARD_ATSTK1006)  += atstk1002.o
diff --git a/arch/avr32/boards/atstk1000/atstk1000.h b/arch/avr32/boards/atstk1000/atstk1000.h
deleted file mode 100644 (file)
index 653cc09..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * ATSTK1000 setup code: Daughterboard interface
- *
- * Copyright (C) 2007 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H
-#define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H
-
-extern struct atmel_lcdfb_pdata atstk1000_lcdc_data;
-
-void atstk1000_setup_j2_leds(void);
-
-#endif /* __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H */
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
deleted file mode 100644 (file)
index 6c80aba..0000000
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * ATSTK1002/ATSTK1006 daughterboard-specific init code
- *
- * Copyright (C) 2005-2007 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/clk.h>
-#include <linux/etherdevice.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/at73c213.h>
-#include <linux/atmel-mci.h>
-
-#include <video/atmel_lcdc.h>
-
-#include <asm/io.h>
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/board.h>
-#include <mach/init.h>
-#include <mach/portmux.h>
-
-#include "atstk1000.h"
-
-/* Oscillator frequencies. These are board specific */
-unsigned long at32_board_osc_rates[3] = {
-       [0] = 32768,    /* 32.768 kHz on RTC osc */
-       [1] = 20000000, /* 20 MHz on osc0 */
-       [2] = 12000000, /* 12 MHz on osc1 */
-};
-
-/*
- * The ATSTK1006 daughterboard is very similar to the ATSTK1002. Both
- * have the AT32AP7000 chip on board; the difference is that the
- * STK1006 has 128 MB SDRAM (the STK1002 uses the 8 MB SDRAM chip on
- * the STK1000 motherboard) and 256 MB NAND flash (the STK1002 has
- * none.)
- *
- * The RAM difference is handled by the boot loader, so the only
- * difference we end up handling here is the NAND flash.
- */
-#ifdef CONFIG_BOARD_ATSTK1006
-#include <linux/mtd/partitions.h>
-#include <mach/smc.h>
-
-static struct smc_timing nand_timing __initdata = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 10,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 10,
-
-       .ncs_read_pulse         = 30,
-       .nrd_pulse              = 15,
-       .ncs_write_pulse        = 30,
-       .nwe_pulse              = 15,
-
-       .read_cycle             = 30,
-       .write_cycle            = 30,
-
-       .ncs_read_recover       = 0,
-       .nrd_recover            = 15,
-       .ncs_write_recover      = 0,
-       /* WE# high -> RE# low min 60 ns */
-       .nwe_recover            = 50,
-};
-
-static struct smc_config nand_config __initdata = {
-       .bus_width              = 1,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .nwait_mode             = 0,
-       .byte_write             = 0,
-       .tdf_cycles             = 2,
-       .tdf_mode               = 0,
-};
-
-static struct mtd_partition nand_partitions[] = {
-       {
-               .name           = "main",
-               .offset         = 0x00000000,
-               .size           = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct atmel_nand_data atstk1006_nand_data __initdata = {
-       .cle            = 21,
-       .ale            = 22,
-       .rdy_pin        = GPIO_PIN_PB(30),
-       .enable_pin     = GPIO_PIN_PB(29),
-       .ecc_mode       = NAND_ECC_SOFT,
-       .parts          = nand_partitions,
-       .num_parts      = ARRAY_SIZE(nand_partitions),
-};
-#endif
-
-struct eth_addr {
-       u8 addr[6];
-};
-
-static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2] = {
-       {
-               /*
-                * The MDIO pullups on STK1000 are a bit too weak for
-                * the autodetection to work properly, so we have to
-                * mask out everything but the correct address.
-                */
-               .phy_mask       = ~(1U << 16),
-       },
-       {
-               .phy_mask       = ~(1U << 17),
-       },
-};
-
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-static struct at73c213_board_info at73c213_data = {
-       .ssc_id         = 0,
-       .shortname      = "AVR32 STK1000 external DAC",
-};
-#endif
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM
-static struct spi_board_info spi0_board_info[] __initdata = {
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-       {
-               /* AT73C213 */
-               .modalias       = "at73c213",
-               .max_speed_hz   = 200000,
-               .chip_select    = 0,
-               .mode           = SPI_MODE_1,
-               .platform_data  = &at73c213_data,
-       },
-#endif
-       {
-               /* QVGA display */
-               .modalias       = "ltv350qv",
-               .max_speed_hz   = 16000000,
-               .chip_select    = 1,
-               .mode           = SPI_MODE_3,
-       },
-};
-#endif
-
-#ifdef CONFIG_BOARD_ATSTK100X_SPI1
-static struct spi_board_info spi1_board_info[] __initdata = { {
-       /* patch in custom entries here */
-} };
-#endif
-
-/*
- * The next two functions should go away as the boot loader is
- * supposed to initialize the macb address registers with a valid
- * ethernet address. But we need to keep it around for a while until
- * we can be reasonably sure the boot loader does this.
- *
- * The phy_id is ignored as the driver will probe for it.
- */
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-       int i;
-
-       i = tag->u.ethernet.mac_index;
-       if (i < ARRAY_SIZE(hw_addr))
-               memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
-                      sizeof(hw_addr[i].addr));
-
-       return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
-static void __init set_hw_addr(struct platform_device *pdev)
-{
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       const u8 *addr;
-       void __iomem *regs;
-       struct clk *pclk;
-
-       if (!res)
-               return;
-       if (pdev->id >= ARRAY_SIZE(hw_addr))
-               return;
-
-       addr = hw_addr[pdev->id].addr;
-       if (!is_valid_ether_addr(addr))
-               return;
-
-       /*
-        * Since this is board-specific code, we'll cheat and use the
-        * physical address directly as we happen to know that it's
-        * the same as the virtual address.
-        */
-       regs = (void __iomem __force *)res->start;
-       pclk = clk_get(&pdev->dev, "pclk");
-       if (IS_ERR(pclk))
-               return;
-
-       clk_enable(pclk);
-       __raw_writel((addr[3] << 24) | (addr[2] << 16)
-                    | (addr[1] << 8) | addr[0], regs + 0x98);
-       __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
-       clk_disable(pclk);
-       clk_put(pclk);
-}
-
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-static void __init atstk1002_setup_extdac(void)
-{
-       struct clk *gclk;
-       struct clk *pll;
-
-       gclk = clk_get(NULL, "gclk0");
-       if (IS_ERR(gclk))
-               goto err_gclk;
-       pll = clk_get(NULL, "pll0");
-       if (IS_ERR(pll))
-               goto err_pll;
-
-       if (clk_set_parent(gclk, pll)) {
-               pr_debug("STK1000: failed to set pll0 as parent for DAC clock\n");
-               goto err_set_clk;
-       }
-
-       at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0);
-       at73c213_data.dac_clk = gclk;
-
-err_set_clk:
-       clk_put(pll);
-err_pll:
-       clk_put(gclk);
-err_gclk:
-       return;
-}
-#else
-static void __init atstk1002_setup_extdac(void)
-{
-
-}
-#endif /* CONFIG_BOARD_ATSTK1000_EXTDAC */
-
-void __init setup_board(void)
-{
-#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
-#else
-       at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
-#endif
-       /* USART 2/unused: expansion connector */
-       at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
-
-       at32_setup_serial_console(0);
-}
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-
-/* MMC card detect requires MACB0 *NOT* be used */
-#ifdef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM
-               .detect_pin     = GPIO_PIN_PC(14), /* gpio30/sdcd */
-               .wp_pin         = GPIO_PIN_PC(15), /* gpio31/sdwp */
-#else
-               .detect_pin     = -ENODEV,
-               .wp_pin         = -ENODEV,
-#endif /* SW6 for sd{cd,wp} routing */
-       },
-};
-
-#endif /* SW2 for MMC signal routing */
-
-static int __init atstk1002_init(void)
-{
-       /*
-        * ATSTK1000 uses 32-bit SDRAM interface. Reserve the
-        * SDRAM-specific pins so that nobody messes with them.
-        */
-       at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
-
-#ifdef CONFIG_BOARD_ATSTK1006
-       smc_set_timing(&nand_config, &nand_timing);
-       smc_set_configuration(3, &nand_config);
-       at32_add_device_nand(0, &atstk1006_nand_data);
-#endif
-
-#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_add_device_usart(1);
-#else
-       at32_add_device_usart(0);
-#endif
-       at32_add_device_usart(2);
-
-#ifndef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM
-       set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
-#endif
-#ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM
-       at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
-#endif
-#ifdef CONFIG_BOARD_ATSTK100X_SPI1
-       at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
-#endif
-#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_add_device_mci(0, &mci0_data);
-#endif
-#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM
-       set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
-#else
-       at32_add_device_lcdc(0, &atstk1000_lcdc_data,
-                            fbmem_start, fbmem_size,
-                            ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL);
-#endif
-       at32_add_device_usba(0, NULL);
-#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM
-       at32_add_device_ssc(0, ATMEL_SSC_TX);
-#endif
-
-       atstk1000_setup_j2_leds();
-       atstk1002_setup_extdac();
-
-       return 0;
-}
-postcore_initcall(atstk1002_init);
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
deleted file mode 100644 (file)
index ff7e232..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * ATSTK1003 daughterboard-specific init code
- *
- * Copyright (C) 2007 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/string.h>
-#include <linux/types.h>
-
-#include <linux/spi/at73c213.h>
-#include <linux/spi/spi.h>
-#include <linux/atmel-mci.h>
-
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/board.h>
-#include <mach/init.h>
-#include <mach/portmux.h>
-
-#include "atstk1000.h"
-
-/* Oscillator frequencies. These are board specific */
-unsigned long at32_board_osc_rates[3] = {
-       [0] = 32768,    /* 32.768 kHz on RTC osc */
-       [1] = 20000000, /* 20 MHz on osc0 */
-       [2] = 12000000, /* 12 MHz on osc1 */
-};
-
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-static struct at73c213_board_info at73c213_data = {
-       .ssc_id         = 0,
-       .shortname      = "AVR32 STK1000 external DAC",
-};
-#endif
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM
-static struct spi_board_info spi0_board_info[] __initdata = {
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-       {
-               /* AT73C213 */
-               .modalias       = "at73c213",
-               .max_speed_hz   = 200000,
-               .chip_select    = 0,
-               .mode           = SPI_MODE_1,
-               .platform_data  = &at73c213_data,
-       },
-#endif
-       /*
-        * We can control the LTV350QV LCD panel, but it isn't much
-        * point since we don't have an LCD controller...
-        */
-};
-#endif
-
-#ifdef CONFIG_BOARD_ATSTK100X_SPI1
-static struct spi_board_info spi1_board_info[] __initdata = { {
-       /* patch in custom entries here */
-} };
-#endif
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = -ENODEV,
-               .wp_pin         = -ENODEV,
-       },
-};
-#endif
-
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-static void __init atstk1003_setup_extdac(void)
-{
-       struct clk *gclk;
-       struct clk *pll;
-
-       gclk = clk_get(NULL, "gclk0");
-       if (IS_ERR(gclk))
-               goto err_gclk;
-       pll = clk_get(NULL, "pll0");
-       if (IS_ERR(pll))
-               goto err_pll;
-
-       if (clk_set_parent(gclk, pll)) {
-               pr_debug("STK1000: failed to set pll0 as parent for DAC clock\n");
-               goto err_set_clk;
-       }
-
-       at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0);
-       at73c213_data.dac_clk = gclk;
-
-err_set_clk:
-       clk_put(pll);
-err_pll:
-       clk_put(gclk);
-err_gclk:
-       return;
-}
-#else
-static void __init atstk1003_setup_extdac(void)
-{
-
-}
-#endif /* CONFIG_BOARD_ATSTK1000_EXTDAC */
-
-void __init setup_board(void)
-{
-#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
-#else
-       at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
-#endif
-       /* USART 2/unused: expansion connector */
-       at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
-
-       at32_setup_serial_console(0);
-}
-
-static int __init atstk1003_init(void)
-{
-       /*
-        * ATSTK1000 uses 32-bit SDRAM interface. Reserve the
-        * SDRAM-specific pins so that nobody messes with them.
-        */
-       at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
-
-#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_add_device_usart(1);
-#else
-       at32_add_device_usart(0);
-#endif
-       at32_add_device_usart(2);
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM
-       at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
-#endif
-#ifdef CONFIG_BOARD_ATSTK100X_SPI1
-       at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
-#endif
-#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_add_device_mci(0, &mci0_data);
-#endif
-       at32_add_device_usba(0, NULL);
-#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM
-       at32_add_device_ssc(0, ATMEL_SSC_TX);
-#endif
-
-       atstk1000_setup_j2_leds();
-       atstk1003_setup_extdac();
-
-       return 0;
-}
-postcore_initcall(atstk1003_init);
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
deleted file mode 100644 (file)
index 69a9f0f..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * ATSTK1003 daughterboard-specific init code
- *
- * Copyright (C) 2007 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/string.h>
-#include <linux/types.h>
-
-#include <linux/spi/at73c213.h>
-#include <linux/spi/spi.h>
-#include <linux/atmel-mci.h>
-
-#include <video/atmel_lcdc.h>
-
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/board.h>
-#include <mach/init.h>
-#include <mach/portmux.h>
-
-#include "atstk1000.h"
-
-/* Oscillator frequencies. These are board specific */
-unsigned long at32_board_osc_rates[3] = {
-       [0] = 32768,    /* 32.768 kHz on RTC osc */
-       [1] = 20000000, /* 20 MHz on osc0 */
-       [2] = 12000000, /* 12 MHz on osc1 */
-};
-
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-static struct at73c213_board_info at73c213_data = {
-       .ssc_id         = 0,
-       .shortname      = "AVR32 STK1000 external DAC",
-};
-#endif
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM
-static struct spi_board_info spi0_board_info[] __initdata = {
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-       {
-               /* AT73C213 */
-               .modalias       = "at73c213",
-               .max_speed_hz   = 200000,
-               .chip_select    = 0,
-               .mode           = SPI_MODE_1,
-               .platform_data  = &at73c213_data,
-       },
-#endif
-       {
-               /* QVGA display */
-               .modalias       = "ltv350qv",
-               .max_speed_hz   = 16000000,
-               .chip_select    = 1,
-               .mode           = SPI_MODE_3,
-       },
-};
-#endif
-
-#ifdef CONFIG_BOARD_ATSTK100X_SPI1
-static struct spi_board_info spi1_board_info[] __initdata = { {
-       /* patch in custom entries here */
-} };
-#endif
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = -ENODEV,
-               .wp_pin         = -ENODEV,
-       },
-};
-#endif
-
-#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC
-static void __init atstk1004_setup_extdac(void)
-{
-       struct clk *gclk;
-       struct clk *pll;
-
-       gclk = clk_get(NULL, "gclk0");
-       if (IS_ERR(gclk))
-               goto err_gclk;
-       pll = clk_get(NULL, "pll0");
-       if (IS_ERR(pll))
-               goto err_pll;
-
-       if (clk_set_parent(gclk, pll)) {
-               pr_debug("STK1000: failed to set pll0 as parent for DAC clock\n");
-               goto err_set_clk;
-       }
-
-       at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0);
-       at73c213_data.dac_clk = gclk;
-
-err_set_clk:
-       clk_put(pll);
-err_pll:
-       clk_put(gclk);
-err_gclk:
-       return;
-}
-#else
-static void __init atstk1004_setup_extdac(void)
-{
-
-}
-#endif /* CONFIG_BOARD_ATSTK1000_EXTDAC */
-
-void __init setup_board(void)
-{
-#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
-#else
-       at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
-#endif
-       /* USART 2/unused: expansion connector */
-       at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
-
-       at32_setup_serial_console(0);
-}
-
-static int __init atstk1004_init(void)
-{
-#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_add_device_usart(1);
-#else
-       at32_add_device_usart(0);
-#endif
-       at32_add_device_usart(2);
-
-#ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM
-       at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
-#endif
-#ifdef CONFIG_BOARD_ATSTK100X_SPI1
-       at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
-#endif
-#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-       at32_add_device_mci(0, &mci0_data);
-#endif
-       at32_add_device_lcdc(0, &atstk1000_lcdc_data,
-                            fbmem_start, fbmem_size,
-                            ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL);
-       at32_add_device_usba(0, NULL);
-#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM
-       at32_add_device_ssc(0, ATMEL_SSC_TX);
-#endif
-
-       atstk1000_setup_j2_leds();
-       atstk1004_setup_extdac();
-
-       return 0;
-}
-postcore_initcall(atstk1004_init);
diff --git a/arch/avr32/boards/atstk1000/flash.c b/arch/avr32/boards/atstk1000/flash.c
deleted file mode 100644 (file)
index 6e4d561..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * ATSTK1000 board-specific flash initialization
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <mach/smc.h>
-
-static struct smc_timing flash_timing __initdata = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 40,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 10,
-
-       .ncs_read_pulse         = 80,
-       .nrd_pulse              = 40,
-       .ncs_write_pulse        = 65,
-       .nwe_pulse              = 55,
-
-       .read_cycle             = 120,
-       .write_cycle            = 120,
-};
-
-static struct smc_config flash_config __initdata = {
-       .bus_width              = 2,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .byte_write             = 1,
-};
-
-static struct mtd_partition flash_parts[] = {
-       {
-               .name           = "u-boot",
-               .offset         = 0x00000000,
-               .size           = 0x00020000,           /* 128 KiB */
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "root",
-               .offset         = 0x00020000,
-               .size           = 0x007d0000,
-       },
-       {
-               .name           = "env",
-               .offset         = 0x007f0000,
-               .size           = 0x00010000,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-};
-
-static struct physmap_flash_data flash_data = {
-       .width          = 2,
-       .nr_parts       = ARRAY_SIZE(flash_parts),
-       .parts          = flash_parts,
-};
-
-static struct resource flash_resource = {
-       .start          = 0x00000000,
-       .end            = 0x007fffff,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = &flash_resource,
-       .num_resources  = 1,
-       .dev            = {
-               .platform_data = &flash_data,
-       },
-};
-
-/* This needs to be called after the SMC has been initialized */
-static int __init atstk1000_flash_init(void)
-{
-       int ret;
-
-       smc_set_timing(&flash_config, &flash_timing);
-       ret = smc_set_configuration(0, &flash_config);
-       if (ret < 0) {
-               printk(KERN_ERR "atstk1000: failed to set NOR flash timing\n");
-               return ret;
-       }
-
-       platform_device_register(&flash_device);
-
-       return 0;
-}
-device_initcall(atstk1000_flash_init);
diff --git a/arch/avr32/boards/atstk1000/setup.c b/arch/avr32/boards/atstk1000/setup.c
deleted file mode 100644 (file)
index b6b88f5..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * ATSTK1000 board-specific setup code.
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/bootmem.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/types.h>
-#include <linux/linkage.h>
-
-#include <video/atmel_lcdc.h>
-
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/board.h>
-#include <mach/portmux.h>
-
-#include "atstk1000.h"
-
-/* Initialized by bootloader-specific startup code. */
-struct tag *bootloader_tags __initdata;
-
-static struct fb_videomode __initdata ltv350qv_modes[] = {
-       {
-               .name           = "320x240 @ 75",
-               .refresh        = 75,
-               .xres           = 320,          .yres           = 240,
-               .pixclock       = KHZ2PICOS(6891),
-
-               .left_margin    = 17,           .right_margin   = 33,
-               .upper_margin   = 10,           .lower_margin   = 10,
-               .hsync_len      = 16,           .vsync_len      = 1,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata atstk1000_default_monspecs = {
-       .manufacturer           = "SNG",
-       .monitor                = "LTV350QV",
-       .modedb                 = ltv350qv_modes,
-       .modedb_len             = ARRAY_SIZE(ltv350qv_modes),
-       .hfmin                  = 14820,
-       .hfmax                  = 22230,
-       .vfmin                  = 60,
-       .vfmax                  = 90,
-       .dclkmax                = 30000000,
-};
-
-struct atmel_lcdfb_pdata __initdata atstk1000_lcdc_data = {
-       .default_bpp            = 24,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_INVCLK
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &atstk1000_default_monspecs,
-       .guard_time             = 2,
-};
-
-#ifdef CONFIG_BOARD_ATSTK1000_J2_LED
-#include <linux/leds.h>
-
-static struct gpio_led stk1000_j2_led[] = {
-#ifdef CONFIG_BOARD_ATSTK1000_J2_LED8
-#define LEDSTRING "J2 jumpered to LED8"
-       { .name = "led0:amber", .gpio = GPIO_PIN_PB( 8), },
-       { .name = "led1:amber", .gpio = GPIO_PIN_PB( 9), },
-       { .name = "led2:amber", .gpio = GPIO_PIN_PB(10), },
-       { .name = "led3:amber", .gpio = GPIO_PIN_PB(13), },
-       { .name = "led4:amber", .gpio = GPIO_PIN_PB(14), },
-       { .name = "led5:amber", .gpio = GPIO_PIN_PB(15), },
-       { .name = "led6:amber", .gpio = GPIO_PIN_PB(16), },
-       { .name = "led7:amber", .gpio = GPIO_PIN_PB(30),
-                       .default_trigger = "heartbeat", },
-#else  /* RGB */
-#define LEDSTRING "J2 jumpered to RGB LEDs"
-       { .name = "r1:red",     .gpio = GPIO_PIN_PB( 8), },
-       { .name = "g1:green",   .gpio = GPIO_PIN_PB(10), },
-       { .name = "b1:blue",    .gpio = GPIO_PIN_PB(14), },
-
-       { .name = "r2:red",     .gpio = GPIO_PIN_PB( 9),
-                       .default_trigger = "heartbeat", },
-       { .name = "g2:green",   .gpio = GPIO_PIN_PB(13), },
-       { .name = "b2:blue",    .gpio = GPIO_PIN_PB(15),
-                       .default_trigger = "heartbeat", },
-       /* PB16, PB30 unused */
-#endif
-};
-
-static struct gpio_led_platform_data stk1000_j2_led_data = {
-       .num_leds       = ARRAY_SIZE(stk1000_j2_led),
-       .leds           = stk1000_j2_led,
-};
-
-static struct platform_device stk1000_j2_led_dev = {
-       .name           = "leds-gpio",
-       .id             = 2,    /* gpio block J2 */
-       .dev            = {
-               .platform_data  = &stk1000_j2_led_data,
-       },
-};
-
-void __init atstk1000_setup_j2_leds(void)
-{
-       unsigned        i;
-
-       for (i = 0; i < ARRAY_SIZE(stk1000_j2_led); i++)
-               at32_select_gpio(stk1000_j2_led[i].gpio, AT32_GPIOF_OUTPUT);
-
-       printk("STK1000: " LEDSTRING "\n");
-       platform_device_register(&stk1000_j2_led_dev);
-}
-#else /* CONFIG_BOARD_ATSTK1000_J2_LED */
-void __init atstk1000_setup_j2_leds(void)
-{
-
-}
-#endif /* CONFIG_BOARD_ATSTK1000_J2_LED */
diff --git a/arch/avr32/boards/favr-32/Kconfig b/arch/avr32/boards/favr-32/Kconfig
deleted file mode 100644 (file)
index 2c83d1d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Favr-32 customization
-
-if BOARD_FAVR_32
-
-config BOARD_FAVR32_ABDAC_RATE
-       int "DAC target rate"
-       default 44100
-       range 32000 50000
-       help
-         Specify the target rate the internal DAC should try to match. This
-         will use PLL1 to generate a frequency as close as possible to this
-         rate.
-
-         Must be within the range 32000 to 50000, which should be suitable to
-         generate most other frequencies in power of 2 steps.
-
-         Ex:
-               48000 will also suit 24000 and 12000
-               44100 will also suit 22050 and 11025
-               32000 will also suit 16000 and 8000
-
-endif # BOARD_FAVR_32
diff --git a/arch/avr32/boards/favr-32/Makefile b/arch/avr32/boards/favr-32/Makefile
deleted file mode 100644 (file)
index 234f215..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y  += setup.o flash.o
diff --git a/arch/avr32/boards/favr-32/flash.c b/arch/avr32/boards/favr-32/flash.c
deleted file mode 100644 (file)
index 604bbd5..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Favr-32 board-specific flash initialization
- *
- * Copyright (C) 2008 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <mach/smc.h>
-
-static struct smc_timing flash_timing __initdata = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 40,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 10,
-
-       .ncs_read_pulse         = 80,
-       .nrd_pulse              = 40,
-       .ncs_write_pulse        = 65,
-       .nwe_pulse              = 55,
-
-       .read_cycle             = 120,
-       .write_cycle            = 120,
-};
-
-static struct smc_config flash_config __initdata = {
-       .bus_width              = 2,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .byte_write             = 1,
-};
-
-static struct mtd_partition flash_parts[] = {
-       {
-               .name           = "u-boot",
-               .offset         = 0x00000000,
-               .size           = 0x00020000,           /* 128 KiB */
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "root",
-               .offset         = 0x00020000,
-               .size           = 0x007d0000,
-       },
-       {
-               .name           = "env",
-               .offset         = 0x007f0000,
-               .size           = 0x00010000,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-};
-
-static struct physmap_flash_data flash_data = {
-       .width          = 2,
-       .nr_parts       = ARRAY_SIZE(flash_parts),
-       .parts          = flash_parts,
-};
-
-static struct resource flash_resource = {
-       .start          = 0x00000000,
-       .end            = 0x007fffff,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = &flash_resource,
-       .num_resources  = 1,
-       .dev            = {
-               .platform_data = &flash_data,
-       },
-};
-
-/* This needs to be called after the SMC has been initialized */
-static int __init favr32_flash_init(void)
-{
-       int ret;
-
-       smc_set_timing(&flash_config, &flash_timing);
-       ret = smc_set_configuration(0, &flash_config);
-       if (ret < 0) {
-               printk(KERN_ERR "Favr-32: failed to set NOR flash timing\n");
-               return ret;
-       }
-
-       platform_device_register(&flash_device);
-
-       return 0;
-}
-device_initcall(favr32_flash_init);
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
deleted file mode 100644 (file)
index 234cb07..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Favr-32 board-specific setup code.
- *
- * Copyright (C) 2008 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/clk.h>
-#include <linux/etherdevice.h>
-#include <linux/bootmem.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/types.h>
-#include <linux/linkage.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <linux/atmel-mci.h>
-#include <linux/pwm.h>
-#include <linux/pwm_backlight.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/machine.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
-
-#include <sound/atmel-abdac.h>
-
-#include <video/atmel_lcdc.h>
-
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/init.h>
-#include <mach/board.h>
-#include <mach/portmux.h>
-
-#define PWM_BL_CH 2
-
-/* Oscillator frequencies. These are board-specific */
-unsigned long at32_board_osc_rates[3] = {
-       [0] = 32768,    /* 32.768 kHz on RTC osc */
-       [1] = 20000000, /* 20 MHz on osc0 */
-       [2] = 12000000, /* 12 MHz on osc1 */
-};
-
-/* Initialized by bootloader-specific startup code. */
-struct tag *bootloader_tags __initdata;
-
-static struct atmel_abdac_pdata __initdata abdac0_data = {
-};
-
-struct eth_addr {
-       u8 addr[6];
-};
-static struct eth_addr __initdata hw_addr[1];
-static struct macb_platform_data __initdata eth_data[1] = {
-       {
-               .phy_mask       = ~(1U << 1),
-       },
-};
-
-static int ads7843_get_pendown_state(void)
-{
-       return !gpio_get_value(GPIO_PIN_PB(3));
-}
-
-static struct ads7846_platform_data ads7843_data = {
-       .model                  = 7843,
-       .get_pendown_state      = ads7843_get_pendown_state,
-       .pressure_max           = 255,
-       /*
-        * Values below are for debounce filtering, these can be experimented
-        * with further.
-        */
-       .debounce_max           = 20,
-       .debounce_rep           = 4,
-       .debounce_tol           = 5,
-
-       .keep_vref_on           = true,
-       .settle_delay_usecs     = 500,
-       .penirq_recheck_delay_usecs = 100,
-};
-
-static struct spi_board_info __initdata spi1_board_info[] = {
-       {
-               /* ADS7843 touch controller */
-               .modalias       = "ads7846",
-               .max_speed_hz   = 2000000,
-               .chip_select    = 0,
-               .bus_num        = 1,
-               .platform_data  = &ads7843_data,
-       },
-};
-
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = -ENODEV,
-               .wp_pin         = -ENODEV,
-       },
-};
-
-static struct fb_videomode __initdata lb104v03_modes[] = {
-       {
-               .name           = "640x480 @ 50",
-               .refresh        = 50,
-               .xres           = 640,          .yres           = 480,
-               .pixclock       = KHZ2PICOS(25100),
-
-               .left_margin    = 90,           .right_margin   = 70,
-               .upper_margin   = 30,           .lower_margin   = 15,
-               .hsync_len      = 12,           .vsync_len      = 2,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata favr32_default_monspecs = {
-       .manufacturer           = "LG",
-       .monitor                = "LB104V03",
-       .modedb                 = lb104v03_modes,
-       .modedb_len             = ARRAY_SIZE(lb104v03_modes),
-       .hfmin                  = 27273,
-       .hfmax                  = 31111,
-       .vfmin                  = 45,
-       .vfmax                  = 60,
-       .dclkmax                = 28000000,
-};
-
-struct atmel_lcdfb_pdata __initdata favr32_lcdc_data = {
-       .default_bpp            = 16,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &favr32_default_monspecs,
-       .guard_time             = 2,
-};
-
-static struct gpio_led favr32_leds[] = {
-       {
-               .name            = "green",
-               .gpio            = GPIO_PIN_PE(19),
-               .default_trigger = "heartbeat",
-               .active_low      = 1,
-       },
-       {
-               .name            = "red",
-               .gpio            = GPIO_PIN_PE(20),
-               .active_low      = 1,
-       },
-};
-
-static struct gpio_led_platform_data favr32_led_data = {
-       .num_leds       = ARRAY_SIZE(favr32_leds),
-       .leds           = favr32_leds,
-};
-
-static struct platform_device favr32_led_dev = {
-       .name           = "leds-gpio",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &favr32_led_data,
-       },
-};
-
-/*
- * The next two functions should go away as the boot loader is
- * supposed to initialize the macb address registers with a valid
- * ethernet address. But we need to keep it around for a while until
- * we can be reasonably sure the boot loader does this.
- *
- * The phy_id is ignored as the driver will probe for it.
- */
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-       int i;
-
-       i = tag->u.ethernet.mac_index;
-       if (i < ARRAY_SIZE(hw_addr))
-               memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
-                      sizeof(hw_addr[i].addr));
-
-       return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
-static void __init set_hw_addr(struct platform_device *pdev)
-{
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       const u8 *addr;
-       void __iomem *regs;
-       struct clk *pclk;
-
-       if (!res)
-               return;
-       if (pdev->id >= ARRAY_SIZE(hw_addr))
-               return;
-
-       addr = hw_addr[pdev->id].addr;
-       if (!is_valid_ether_addr(addr))
-               return;
-
-       /*
-        * Since this is board-specific code, we'll cheat and use the
-        * physical address directly as we happen to know that it's
-        * the same as the virtual address.
-        */
-       regs = (void __iomem __force *)res->start;
-       pclk = clk_get(&pdev->dev, "pclk");
-       if (IS_ERR(pclk))
-               return;
-
-       clk_enable(pclk);
-       __raw_writel((addr[3] << 24) | (addr[2] << 16)
-                    | (addr[1] << 8) | addr[0], regs + 0x98);
-       __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
-       clk_disable(pclk);
-       clk_put(pclk);
-}
-
-void __init favr32_setup_leds(void)
-{
-       unsigned i;
-
-       for (i = 0; i < ARRAY_SIZE(favr32_leds); i++)
-               at32_select_gpio(favr32_leds[i].gpio, AT32_GPIOF_OUTPUT);
-
-       platform_device_register(&favr32_led_dev);
-}
-
-static struct pwm_lookup pwm_lookup[] = {
-       PWM_LOOKUP("at91sam9rl-pwm", PWM_BL_CH, "pwm-backlight.0", NULL,
-                  5000, PWM_POLARITY_INVERSED),
-};
-
-static struct regulator_consumer_supply fixed_power_consumers[] = {
-       REGULATOR_SUPPLY("power", "pwm-backlight.0"),
-};
-
-static struct platform_pwm_backlight_data pwm_bl_data = {
-       .enable_gpio            = GPIO_PIN_PA(28),
-       .max_brightness         = 255,
-       .dft_brightness         = 255,
-       .lth_brightness         = 50,
-};
-
-static struct platform_device pwm_bl_device = {
-       .name = "pwm-backlight",
-       .dev = {
-               .platform_data = &pwm_bl_data,
-       },
-};
-
-static void __init favr32_setup_atmel_pwm_bl(void)
-{
-       pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
-       regulator_register_always_on(0, "fixed", fixed_power_consumers,
-                                   ARRAY_SIZE(fixed_power_consumers), 3300000);
-       platform_device_register(&pwm_bl_device);
-       at32_select_gpio(pwm_bl_data.enable_gpio, 0);
-}
-
-void __init setup_board(void)
-{
-       at32_map_usart(3, 0, 0);        /* USART 3 => /dev/ttyS0 */
-       at32_setup_serial_console(0);
-}
-
-static int __init set_abdac_rate(struct platform_device *pdev)
-{
-       int retval;
-       struct clk *osc1;
-       struct clk *pll1;
-       struct clk *abdac;
-
-       if (pdev == NULL)
-               return -ENXIO;
-
-       osc1 = clk_get(NULL, "osc1");
-       if (IS_ERR(osc1)) {
-               retval = PTR_ERR(osc1);
-               goto out;
-       }
-
-       pll1 = clk_get(NULL, "pll1");
-       if (IS_ERR(pll1)) {
-               retval = PTR_ERR(pll1);
-               goto out_osc1;
-       }
-
-       abdac = clk_get(&pdev->dev, "sample_clk");
-       if (IS_ERR(abdac)) {
-               retval = PTR_ERR(abdac);
-               goto out_pll1;
-       }
-
-       retval = clk_set_parent(pll1, osc1);
-       if (retval != 0)
-               goto out_abdac;
-
-       /*
-        * Rate is 32000 to 50000 and ABDAC oversamples 256x. Multiply, in
-        * power of 2, to a value above 80 MHz. Power of 2 so it is possible
-        * for the generic clock to divide it down again and 80 MHz is the
-        * lowest frequency for the PLL.
-        */
-       retval = clk_round_rate(pll1,
-                       CONFIG_BOARD_FAVR32_ABDAC_RATE * 256 * 16);
-       if (retval <= 0) {
-               retval = -EINVAL;
-               goto out_abdac;
-       }
-
-       retval = clk_set_rate(pll1, retval);
-       if (retval != 0)
-               goto out_abdac;
-
-       retval = clk_set_parent(abdac, pll1);
-       if (retval != 0)
-               goto out_abdac;
-
-out_abdac:
-       clk_put(abdac);
-out_pll1:
-       clk_put(pll1);
-out_osc1:
-       clk_put(osc1);
-out:
-       return retval;
-}
-
-static int __init favr32_init(void)
-{
-       /*
-        * Favr-32 uses 32-bit SDRAM interface. Reserve the SDRAM-specific
-        * pins so that nobody messes with them.
-        */
-       at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
-
-       at32_select_gpio(GPIO_PIN_PB(3), 0);    /* IRQ from ADS7843 */
-
-       at32_add_device_usart(0);
-
-       set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
-
-       spi1_board_info[0].irq = gpio_to_irq(GPIO_PIN_PB(3));
-
-       set_abdac_rate(at32_add_device_abdac(0, &abdac0_data));
-
-       at32_add_device_pwm(1 << PWM_BL_CH);
-       at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
-       at32_add_device_mci(0, &mci0_data);
-       at32_add_device_usba(0, NULL);
-       at32_add_device_lcdc(0, &favr32_lcdc_data, fbmem_start, fbmem_size, 0);
-
-       favr32_setup_leds();
-
-       favr32_setup_atmel_pwm_bl();
-
-       return 0;
-}
-postcore_initcall(favr32_init);
diff --git a/arch/avr32/boards/hammerhead/Kconfig b/arch/avr32/boards/hammerhead/Kconfig
deleted file mode 100644 (file)
index 5c13d78..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-# Hammerhead customization
-
-if BOARD_HAMMERHEAD
-
-config BOARD_HAMMERHEAD_USB
-       bool "Philips ISP116x-hcd USB support"
-       help
-         This enables USB support for Hammerheads internal ISP116x
-         controller from Philips.
-
-         Choose 'Y' here if you want to have your board USB driven.
-
-config BOARD_HAMMERHEAD_LCD
-       bool "Atmel AT91/AT32 LCD support"
-       help
-         This enables LCD support for the Hammerhead board. You may
-         also add support for framebuffer devices (AT91/AT32 LCD Controller)
-         and framebuffer console support to get the most out of your LCD.
-
-         Choose 'Y' here if you have ordered a Corona daugther board and
-         want to have support for your Hantronix HDA-351T-LV LCD.
-
-config BOARD_HAMMERHEAD_SND
-       bool "Atmel AC97 Sound support"
-       help
-         This enables Sound support for the Hammerhead board. You may
-         also go through the ALSA settings to get it working.
-
-         Choose 'Y' here if you have ordered a Corona daugther board and
-         want to make your board funky.
-
-config BOARD_HAMMERHEAD_FPGA
-       bool "Hammerhead FPGA Support"
-       default y
-       help
-         This adds support for the Cyclone III FPGA from Altera
-         found on Miromico's Hammerhead board.
-
-         Choose 'Y' here if you want to have FPGA support enabled.
-         You will have to choose the "Hammerhead FPGA Device Support" in
-         Device Drivers->Misc to be able to use FPGA functionality.
-
-endif  # BOARD_ATNGW100
diff --git a/arch/avr32/boards/hammerhead/Makefile b/arch/avr32/boards/hammerhead/Makefile
deleted file mode 100644 (file)
index c740aa1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y                          += setup.o flash.o
diff --git a/arch/avr32/boards/hammerhead/flash.c b/arch/avr32/boards/hammerhead/flash.c
deleted file mode 100644 (file)
index e86280c..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Hammerhead board-specific flash initialization
- *
- * Copyright (C) 2008 Miromico AG
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/usb/isp116x.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-
-#include <mach/portmux.h>
-#include <mach/at32ap700x.h>
-#include <mach/smc.h>
-
-#include "../../mach-at32ap/clock.h"
-#include "flash.h"
-
-
-#define HAMMERHEAD_USB_PERIPH_GCLK0    0x40000000
-#define HAMMERHEAD_USB_PERIPH_CS2      0x02000000
-#define HAMMERHEAD_USB_PERIPH_EXTINT0  0x02000000
-
-#define HAMMERHEAD_FPGA_PERIPH_MOSI    0x00000002
-#define HAMMERHEAD_FPGA_PERIPH_SCK     0x00000020
-#define HAMMERHEAD_FPGA_PERIPH_EXTINT3 0x10000000
-
-static struct smc_timing flash_timing __initdata = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 40,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 10,
-
-       .ncs_read_pulse         = 80,
-       .nrd_pulse              = 40,
-       .ncs_write_pulse        = 65,
-       .nwe_pulse              = 55,
-
-       .read_cycle             = 120,
-       .write_cycle            = 120,
-};
-
-static struct smc_config flash_config __initdata = {
-       .bus_width              = 2,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .byte_write             = 1,
-};
-
-static struct mtd_partition flash_parts[] = {
-       {
-               .name           = "u-boot",
-               .offset         = 0x00000000,
-               .size           = 0x00020000,           /* 128 KiB */
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "root",
-               .offset         = 0x00020000,
-               .size           = 0x007d0000,
-       },
-       {
-               .name           = "env",
-               .offset         = 0x007f0000,
-               .size           = 0x00010000,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-};
-
-static struct physmap_flash_data flash_data = {
-       .width          = 2,
-       .nr_parts       = ARRAY_SIZE(flash_parts),
-       .parts          = flash_parts,
-};
-
-static struct resource flash_resource = {
-       .start          = 0x00000000,
-       .end            = 0x007fffff,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = &flash_resource,
-       .num_resources  = 1,
-       .dev            = { .platform_data = &flash_data, },
-};
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_USB
-
-static struct smc_timing isp1160_timing __initdata = {
-       .ncs_read_setup         = 75,
-       .nrd_setup              = 75,
-       .ncs_write_setup        = 75,
-       .nwe_setup              = 75,
-
-
-       /* We use conservative timing settings, as the minimal settings aren't
-          stable. There may be room for tweaking. */
-       .ncs_read_pulse         = 75,  /* min. 33ns */
-       .nrd_pulse              = 75,  /* min. 33ns */
-       .ncs_write_pulse        = 75,  /* min. 26ns */
-       .nwe_pulse              = 75,  /* min. 26ns */
-
-       .read_cycle             = 225, /* min. 143ns */
-       .write_cycle            = 225, /* min. 136ns */
-};
-
-static struct smc_config isp1160_config __initdata = {
-       .bus_width              = 2,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .byte_write             = 0,
-};
-
-/*
- * The platform delay function is only used to enforce the strange
- * read to write delay. This can not be configured in the SMC. All other
- * timings are controlled by the SMC (see timings obove)
- * So in isp116x-hcd.c we should comment out USE_PLATFORM_DELAY
- */
-void isp116x_delay(struct device *dev, int delay)
-{
-       if (delay > 150)
-               ndelay(delay - 150);
-}
-
-static struct  isp116x_platform_data isp1160_data = {
-       .sel15Kres              = 1,    /* use internal downstream resistors */
-       .oc_enable              = 0,    /* external overcurrent detection */
-       .int_edge_triggered     = 0,    /* interrupt is level triggered */
-       .int_act_high           = 0,    /* interrupt is active low */
-       .delay = isp116x_delay,         /* platform delay function */
-};
-
-static struct resource isp1160_resource[] = {
-       {
-               .start          = 0x08000000,
-               .end            = 0x08000001,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = 0x08000002,
-               .end            = 0x08000003,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = 64,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device isp1160_device = {
-       .name           = "isp116x-hcd",
-       .id             = 0,
-       .resource       = isp1160_resource,
-       .num_resources  = 3,
-       .dev            = {
-               .platform_data = &isp1160_data,
-       },
-};
-#endif
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_USB
-static int __init hammerhead_usbh_init(void)
-{
-       struct clk *gclk;
-       struct clk *osc;
-
-       int ret;
-
-       /* setup smc for usbh */
-       smc_set_timing(&isp1160_config, &isp1160_timing);
-       ret = smc_set_configuration(2, &isp1160_config);
-
-       if (ret < 0) {
-               printk(KERN_ERR
-                      "hammerhead: failed to set ISP1160 USBH timing\n");
-               return ret;
-       }
-
-       /* setup gclk0 to run from osc1 */
-       gclk = clk_get(NULL, "gclk0");
-       if (IS_ERR(gclk)) {
-               ret = PTR_ERR(gclk);
-               goto err_gclk;
-       }
-
-       osc = clk_get(NULL, "osc1");
-       if (IS_ERR(osc)) {
-               ret = PTR_ERR(osc);
-               goto err_osc;
-       }
-
-       ret = clk_set_parent(gclk, osc);
-       if (ret < 0) {
-               pr_debug("hammerhead: failed to set osc1 for USBH clock\n");
-               goto err_set_clk;
-       }
-
-       /* set clock to 6MHz */
-       clk_set_rate(gclk, 6000000);
-
-       /* and enable */
-       clk_enable(gclk);
-
-       /* select GCLK0 peripheral function */
-       at32_select_periph(GPIO_PIOA_BASE, HAMMERHEAD_USB_PERIPH_GCLK0,
-                          GPIO_PERIPH_A, 0);
-
-       /* enable CS2 peripheral function */
-       at32_select_periph(GPIO_PIOE_BASE, HAMMERHEAD_USB_PERIPH_CS2,
-                          GPIO_PERIPH_A, 0);
-
-       /* H_WAKEUP must be driven low */
-       at32_select_gpio(GPIO_PIN_PA(8), AT32_GPIOF_OUTPUT);
-
-       /* Select EXTINT0 for PB25 */
-       at32_select_periph(GPIO_PIOB_BASE, HAMMERHEAD_USB_PERIPH_EXTINT0,
-                          GPIO_PERIPH_A, 0);
-
-       /* register usbh device driver */
-       platform_device_register(&isp1160_device);
-
- err_set_clk:
-       clk_put(osc);
- err_osc:
-       clk_put(gclk);
- err_gclk:
-       return ret;
-}
-#endif
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_FPGA
-static struct smc_timing fpga_timing __initdata = {
-       .ncs_read_setup         = 16,
-       .nrd_setup              = 32,
-       .ncs_read_pulse         = 48,
-       .nrd_pulse              = 32,
-       .read_cycle             = 64,
-
-       .ncs_write_setup        = 16,
-       .nwe_setup              = 16,
-       .ncs_write_pulse        = 32,
-       .nwe_pulse              = 32,
-       .write_cycle            = 64,
-};
-
-static struct smc_config fpga_config __initdata = {
-       .bus_width              = 4,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .byte_write             = 0,
-};
-
-static struct resource hh_fpga0_resource[] = {
-       {
-               .start          = 0xffe00400,
-               .end            = 0xffe00400 + 0x3ff,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = 4,
-               .end            = 4,
-               .flags          = IORESOURCE_IRQ,
-       },
-       {
-               .start          = 0x0c000000,
-               .end            = 0x0c000100,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = 67,
-               .end            = 67,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static u64 hh_fpga0_dma_mask = DMA_BIT_MASK(32);
-static struct platform_device hh_fpga0_device = {
-       .name           = "hh_fpga",
-       .id             = 0,
-       .dev            = {
-               .dma_mask = &hh_fpga0_dma_mask,
-               .coherent_dma_mask = DMA_BIT_MASK(32),
-       },
-       .resource       = hh_fpga0_resource,
-       .num_resources  = ARRAY_SIZE(hh_fpga0_resource),
-};
-
-static struct clk hh_fpga0_spi_clk = {
-       .name           = "spi_clk",
-       .dev            = &hh_fpga0_device.dev,
-       .mode           = pba_clk_mode,
-       .get_rate       = pba_clk_get_rate,
-       .index          = 1,
-};
-
-struct platform_device *__init at32_add_device_hh_fpga(void)
-{
-       /* Select peripheral functionallity for SPI SCK and MOSI */
-       at32_select_periph(GPIO_PIOB_BASE, HAMMERHEAD_FPGA_PERIPH_SCK,
-                          GPIO_PERIPH_B, 0);
-       at32_select_periph(GPIO_PIOB_BASE, HAMMERHEAD_FPGA_PERIPH_MOSI,
-                          GPIO_PERIPH_B, 0);
-
-       /* reserve all other needed gpio
-        * We have on board pull ups, so there is no need
-        * to enable gpio pull ups */
-       /* INIT_DONE (input) */
-       at32_select_gpio(GPIO_PIN_PB(0), 0);
-
-       /* nSTATUS (input) */
-       at32_select_gpio(GPIO_PIN_PB(2), 0);
-
-       /* nCONFIG (output, low) */
-       at32_select_gpio(GPIO_PIN_PB(3), AT32_GPIOF_OUTPUT);
-
-       /* CONF_DONE (input) */
-       at32_select_gpio(GPIO_PIN_PB(4), 0);
-
-       /* Select EXTINT3 for PB28 (Interrupt from FPGA) */
-       at32_select_periph(GPIO_PIOB_BASE, HAMMERHEAD_FPGA_PERIPH_EXTINT3,
-                          GPIO_PERIPH_A, 0);
-
-       /* Get our parent clock */
-       hh_fpga0_spi_clk.parent = clk_get(NULL, "pba");
-       clk_put(hh_fpga0_spi_clk.parent);
-
-       /* Register clock in at32 clock tree */
-       at32_clk_register(&hh_fpga0_spi_clk);
-
-       platform_device_register(&hh_fpga0_device);
-       return &hh_fpga0_device;
-}
-#endif
-
-/* This needs to be called after the SMC has been initialized */
-static int __init hammerhead_flash_init(void)
-{
-       int ret;
-
-       smc_set_timing(&flash_config, &flash_timing);
-       ret = smc_set_configuration(0, &flash_config);
-
-       if (ret < 0) {
-               printk(KERN_ERR "hammerhead: failed to set NOR flash timing\n");
-               return ret;
-       }
-
-       platform_device_register(&flash_device);
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_USB
-       hammerhead_usbh_init();
-#endif
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_FPGA
-       /* Setup SMC for FPGA interface */
-       smc_set_timing(&fpga_config, &fpga_timing);
-       ret = smc_set_configuration(3, &fpga_config);
-#endif
-
-
-       if (ret < 0) {
-               printk(KERN_ERR "hammerhead: failed to set FPGA timing\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-device_initcall(hammerhead_flash_init);
diff --git a/arch/avr32/boards/hammerhead/flash.h b/arch/avr32/boards/hammerhead/flash.h
deleted file mode 100644 (file)
index ea70c62..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __BOARDS_HAMMERHEAD_FLASH_H
-#define __BOARDS_HAMMERHEAD_FLASH_H
-
-struct platform_device *at32_add_device_hh_fpga(void);
-
-#endif /* __BOARDS_HAMMERHEAD_FLASH_H */
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c
deleted file mode 100644 (file)
index dc0e317..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Board-specific setup code for the Miromico Hammerhead board
- *
- * Copyright (C) 2008 Miromico AG
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/atmel-mci.h>
-#include <linux/clk.h>
-#include <linux/fb.h>
-#include <linux/etherdevice.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/init.h>
-#include <linux/linkage.h>
-#include <linux/platform_device.h>
-#include <linux/types.h>
-#include <linux/spi/spi.h>
-
-#include <video/atmel_lcdc.h>
-
-#include <linux/io.h>
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/board.h>
-#include <mach/init.h>
-#include <mach/portmux.h>
-
-#include <sound/atmel-ac97c.h>
-
-#include "../../mach-at32ap/clock.h"
-#include "flash.h"
-
-/* Oscillator frequencies. These are board-specific */
-unsigned long at32_board_osc_rates[3] = {
-       [0] = 32768,    /* 32.768 kHz on RTC osc */
-       [1] = 25000000, /* 25MHz on osc0 */
-       [2] = 12000000, /* 12 MHz on osc1 */
-};
-
-/* Initialized by bootloader-specific startup code. */
-struct tag *bootloader_tags __initdata;
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_LCD
-static struct fb_videomode __initdata hda350tlv_modes[] = {
-       {
-               .name           = "320x240 @ 75",
-               .refresh        = 75,
-               .xres           = 320,
-               .yres           = 240,
-               .pixclock       = KHZ2PICOS(6891),
-
-               .left_margin    = 48,
-               .right_margin   = 18,
-               .upper_margin   = 18,
-               .lower_margin   = 4,
-               .hsync_len      = 20,
-               .vsync_len      = 2,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata hammerhead_hda350t_monspecs = {
-       .manufacturer           = "HAN",
-       .monitor                = "HDA350T-LV",
-       .modedb                 = hda350tlv_modes,
-       .modedb_len             = ARRAY_SIZE(hda350tlv_modes),
-       .hfmin                  = 14900,
-       .hfmax                  = 22350,
-       .vfmin                  = 60,
-       .vfmax                  = 90,
-       .dclkmax                = 10000000,
-};
-
-struct atmel_lcdfb_pdata __initdata hammerhead_lcdc_data = {
-       .default_bpp            = 24,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_INVCLK
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &hammerhead_hda350t_monspecs,
-       .guard_time             = 2,
-};
-#endif
-
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = -ENODEV,
-               .wp_pin         = -ENODEV,
-       },
-};
-
-struct eth_addr {
-       u8 addr[6];
-};
-
-static struct eth_addr __initdata hw_addr[1];
-static struct macb_platform_data __initdata eth_data[1];
-
-/*
- * The next two functions should go away as the boot loader is
- * supposed to initialize the macb address registers with a valid
- * ethernet address. But we need to keep it around for a while until
- * we can be reasonably sure the boot loader does this.
- *
- * The phy_id is ignored as the driver will probe for it.
- */
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-       int i = tag->u.ethernet.mac_index;
-
-       if (i < ARRAY_SIZE(hw_addr))
-               memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
-                      sizeof(hw_addr[i].addr));
-
-       return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
-static void __init set_hw_addr(struct platform_device *pdev)
-{
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       const u8 *addr;
-       void __iomem *regs;
-       struct clk *pclk;
-
-       if (!res)
-               return;
-
-       if (pdev->id >= ARRAY_SIZE(hw_addr))
-               return;
-
-       addr = hw_addr[pdev->id].addr;
-
-       if (!is_valid_ether_addr(addr))
-               return;
-
-       /*
-        * Since this is board-specific code, we'll cheat and use the
-        * physical address directly as we happen to know that it's
-        * the same as the virtual address.
-        */
-       regs = (void __iomem __force *)res->start;
-       pclk = clk_get(&pdev->dev, "pclk");
-
-       if (IS_ERR(pclk))
-               return;
-
-       clk_enable(pclk);
-
-       __raw_writel((addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) |
-                    addr[0], regs + 0x98);
-       __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
-
-       clk_disable(pclk);
-       clk_put(pclk);
-}
-
-void __init setup_board(void)
-{
-       at32_map_usart(1, 0, 0);        /* USART 1: /dev/ttyS0, DB9 */
-       at32_setup_serial_console(0);
-}
-
-static struct i2c_gpio_platform_data i2c_gpio_data = {
-       .sda_pin                = GPIO_PIN_PA(6),
-       .scl_pin                = GPIO_PIN_PA(7),
-       .sda_is_open_drain      = 1,
-       .scl_is_open_drain      = 1,
-       .udelay                 = 2,    /* close to 100 kHz */
-};
-
-static struct platform_device i2c_gpio_device = {
-       .name           = "i2c-gpio",
-       .id             = 0,
-       .dev            = { .platform_data = &i2c_gpio_data, },
-};
-
-static struct i2c_board_info __initdata i2c_info[] = {};
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_SND
-static struct ac97c_platform_data ac97c_data = {
-       .reset_pin = GPIO_PIN_PA(16),
-};
-#endif
-
-static int __init hammerhead_init(void)
-{
-       /*
-        * Hammerhead uses 32-bit SDRAM interface. Reserve the
-        * SDRAM-specific pins so that nobody messes with them.
-        */
-       at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
-
-       at32_add_device_usart(0);
-
-       /* Reserve PB29 (GCLK3). This pin is used as clock source
-        * for ETH PHY (25MHz). GCLK3 setup is done by U-Boot.
-        */
-       at32_reserve_pin(GPIO_PIOB_BASE, (1<<29));
-
-       /*
-        * Hammerhead uses only one ethernet port, so we don't set
-        * address of second port
-        */
-       set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_FPGA
-       at32_add_device_hh_fpga();
-#endif
-       at32_add_device_mci(0, &mci0_data);
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_USB
-       at32_add_device_usba(0, NULL);
-#endif
-#ifdef CONFIG_BOARD_HAMMERHEAD_LCD
-       at32_add_device_lcdc(0, &hammerhead_lcdc_data, fbmem_start,
-                            fbmem_size, ATMEL_LCDC_PRI_24BIT);
-#endif
-
-       at32_select_gpio(i2c_gpio_data.sda_pin,
-                        AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT |
-                        AT32_GPIOF_HIGH);
-       at32_select_gpio(i2c_gpio_data.scl_pin,
-                        AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT |
-                        AT32_GPIOF_HIGH);
-       platform_device_register(&i2c_gpio_device);
-       i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
-
-#ifdef CONFIG_BOARD_HAMMERHEAD_SND
-       at32_add_device_ac97c(0, &ac97c_data, AC97C_BOTH);
-#endif
-
-       /* Select the Touchscreen interrupt pin mode */
-       at32_select_periph(GPIO_PIOB_BASE, 0x08000000, GPIO_PERIPH_A, 0);
-
-       return 0;
-}
-
-postcore_initcall(hammerhead_init);
diff --git a/arch/avr32/boards/merisc/Kconfig b/arch/avr32/boards/merisc/Kconfig
deleted file mode 100644 (file)
index 7e04327..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# Merisc customization
-
-if BOARD_MERISC
-
-endif  # BOARD_MERISC
diff --git a/arch/avr32/boards/merisc/Makefile b/arch/avr32/boards/merisc/Makefile
deleted file mode 100644 (file)
index d24c787..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y                                  += setup.o flash.o display.o merisc_sysfs.o
diff --git a/arch/avr32/boards/merisc/display.c b/arch/avr32/boards/merisc/display.c
deleted file mode 100644 (file)
index e7683ee..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Display setup code for the Merisc board
- *
- * Copyright (C) 2008 Martinsson Elektronik AB
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/fb.h>
-#include <video/atmel_lcdc.h>
-#include <asm/setup.h>
-#include <mach/board.h>
-#include "merisc.h"
-
-static struct fb_videomode merisc_fb_videomode[] = {
-       {
-               .refresh        = 44,
-               .xres           = 640,
-               .yres           = 480,
-               .left_margin    = 96,
-               .right_margin   = 96,
-               .upper_margin   = 34,
-               .lower_margin   = 8,
-               .hsync_len      = 64,
-               .vsync_len      = 64,
-               .name           = "640x480 @ 44",
-               .pixclock       = KHZ2PICOS(25180),
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs merisc_fb_monspecs = {
-       .manufacturer   = "Kyo",
-       .monitor        = "TCG075VG2AD",
-       .modedb         = merisc_fb_videomode,
-       .modedb_len     = ARRAY_SIZE(merisc_fb_videomode),
-       .hfmin          = 30000,
-       .hfmax          = 33333,
-       .vfmin          = 60,
-       .vfmax          = 90,
-       .dclkmax        = 30000000,
-};
-
-struct atmel_lcdfb_pdata merisc_lcdc_data = {
-       .default_bpp            = 24,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &merisc_fb_monspecs,
-       .guard_time             = 2,
-};
-
-static int __init merisc_display_init(void)
-{
-       at32_add_device_lcdc(0, &merisc_lcdc_data, fbmem_start,
-                            fbmem_size, 0);
-
-       return 0;
-}
-device_initcall(merisc_display_init);
diff --git a/arch/avr32/boards/merisc/flash.c b/arch/avr32/boards/merisc/flash.c
deleted file mode 100644 (file)
index 8e856fd..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Merisc board-specific flash initialization
- *
- * Copyright (C) 2008 Martinsson Elektronik AB
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <mach/smc.h>
-
-/* Will be translated to units of 14.3 ns, rounded up */
-static struct smc_timing flash_timing __initdata = {
-       .ncs_read_setup         = 1 * 14,
-       .nrd_setup              = 5 * 14,
-       .ncs_write_setup        = 1 * 14,
-       .nwe_setup              = 2 * 14,
-
-       .ncs_read_pulse         = 12 * 14,
-       .nrd_pulse              = 7 * 14,
-       .ncs_write_pulse        = 8 * 14,
-       .nwe_pulse              = 4 * 14,
-
-       .read_cycle             = 14 * 14,
-       .write_cycle            = 10 * 14,
-};
-
-static struct smc_config flash_config __initdata = {
-       .bus_width      = 2,
-       .nrd_controlled = 1,
-       .nwe_controlled = 1,
-       .byte_write     = 1,
-       .tdf_cycles     = 3,
-};
-
-static struct mtd_partition flash_0_parts[] = {
-       {
-               .name           = "boot",
-               .offset         = 0x00000000,
-               .size           = 0x00060000,
-               .mask_flags     = 0,
-       },
-       {
-               .name           = "kernel",
-               .offset         = 0x00060000,
-               .size           = 0x00200000,
-               .mask_flags     = 0,
-       },
-       {
-               .name           = "root",
-               .offset         = 0x00260000,
-               .size           = MTDPART_SIZ_FULL,
-               .mask_flags     = 0,
-       },
-};
-
-static struct mtd_partition flash_1_parts[] = {
-       {
-               .name           = "2ndflash",
-               .offset         = 0x00000000,
-               .size           = MTDPART_SIZ_FULL,
-               .mask_flags     = 0,
-       },
-};
-
-static struct physmap_flash_data flash_data[] = {
-       {
-               .width          = 2,
-               .nr_parts       = ARRAY_SIZE(flash_0_parts),
-               .parts          = flash_0_parts,
-       },
-       {
-               .width          = 2,
-               .nr_parts       = ARRAY_SIZE(flash_1_parts),
-               .parts          = flash_1_parts,
-       }
-};
-
-static struct resource flash_resource[] = {
-       {
-               .start          = 0x00000000,
-               .end            = 0x03ffffff,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = 0x04000000,
-               .end            = 0x07ffffff,
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device flash_device[] = {
-       {
-               .name           = "physmap-flash",
-               .id             = 0,
-               .resource       = &flash_resource[0],
-               .num_resources  = 1,
-               .dev            = {
-                       .platform_data  = &flash_data[0],
-               },
-       },
-       {
-               .name           = "physmap-flash",
-               .id             = 1,
-               .resource       = &flash_resource[1],
-               .num_resources  = 1,
-               .dev            = {
-                       .platform_data  = &flash_data[1],
-               },
-       },
-};
-
-static int __init merisc_flash_init(void)
-{
-       int ret;
-       smc_set_timing(&flash_config, &flash_timing);
-
-       ret = smc_set_configuration(0, &flash_config);
-       if (ret < 0) {
-               printk(KERN_ERR "Merisc: failed to set NOR flash timing #0\n");
-               return ret;
-       }
-
-       ret = smc_set_configuration(4, &flash_config);
-       if (ret < 0) {
-               printk(KERN_ERR "Merisc: failed to set NOR flash timing #1\n");
-               return ret;
-       }
-
-       platform_device_register(&flash_device[0]);
-       platform_device_register(&flash_device[1]);
-       return 0;
-}
-device_initcall(merisc_flash_init);
diff --git a/arch/avr32/boards/merisc/merisc.h b/arch/avr32/boards/merisc/merisc.h
deleted file mode 100644 (file)
index 50ffb2f..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Merisc exports
- *
- * Copyright (C) 2008 Martinsson Elektronik AB
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ARCH_AVR32_BOARDS_MERISC_MERISC_H
-#define __ARCH_AVR32_BOARDS_MERISC_MERISC_H
-
-const char *merisc_revision(void);
-const char *merisc_model(void);
-
-extern struct class merisc_class;
-
-#endif /* __ARCH_AVR32_BOARDS_MERISC_MERISC_H */
diff --git a/arch/avr32/boards/merisc/merisc_sysfs.c b/arch/avr32/boards/merisc/merisc_sysfs.c
deleted file mode 100644 (file)
index 5a25231..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Merisc sysfs exports
- *
- * Copyright (C) 2008 Martinsson Elektronik AB
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/timer.h>
-#include <linux/err.h>
-#include <linux/ctype.h>
-#include "merisc.h"
-
-static ssize_t merisc_model_show(struct class *class, char *buf)
-{
-       ssize_t ret = 0;
-
-       sprintf(buf, "%s\n", merisc_model());
-       ret = strlen(buf) + 1;
-
-       return ret;
-}
-
-static ssize_t merisc_revision_show(struct class *class, char *buf)
-{
-       ssize_t ret = 0;
-
-       sprintf(buf, "%s\n", merisc_revision());
-       ret = strlen(buf) + 1;
-
-       return ret;
-}
-
-static struct class_attribute merisc_class_attrs[] = {
-       __ATTR(model, S_IRUGO, merisc_model_show, NULL),
-       __ATTR(revision, S_IRUGO, merisc_revision_show, NULL),
-       __ATTR_NULL,
-};
-
-struct class merisc_class = {
-       .name =         "merisc",
-       .owner =        THIS_MODULE,
-       .class_attrs =  merisc_class_attrs,
-};
-
-static int __init merisc_sysfs_init(void)
-{
-       int status;
-
-       status = class_register(&merisc_class);
-       if (status < 0)
-               return status;
-
-       return 0;
-}
-
-postcore_initcall(merisc_sysfs_init);
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
deleted file mode 100644 (file)
index 718a6d7..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Board-specific setup code for the Merisc
- *
- * Copyright (C) 2008 Martinsson Elektronik AB
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/clk.h>
-#include <linux/etherdevice.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/linkage.h>
-#include <linux/platform_device.h>
-#include <linux/types.h>
-#include <linux/leds.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
-#include <linux/irq.h>
-#include <linux/fb.h>
-#include <linux/atmel-mci.h>
-#include <linux/pwm.h>
-#include <linux/leds_pwm.h>
-
-#include <asm/io.h>
-#include <asm/setup.h>
-
-#include <mach/at32ap700x.h>
-#include <mach/board.h>
-#include <mach/init.h>
-#include <mach/portmux.h>
-
-#include "merisc.h"
-
-/* Holds the autodetected board model and revision */
-static int merisc_board_id;
-
-/* Initialized by bootloader-specific startup code. */
-struct tag *bootloader_tags __initdata;
-
-/* Oscillator frequencies. These are board specific */
-unsigned long at32_board_osc_rates[3] = {
-       [0]     = 32768,        /* 32.768 kHz on RTC osc */
-       [1]     = 20000000,     /* 20 MHz on osc0 */
-       [2]     = 12000000,     /* 12 MHz on osc1 */
-};
-
-struct eth_addr {
-       u8 addr[6];
-};
-
-static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2];
-
-static int ads7846_get_pendown_state_PB26(void)
-{
-       return !gpio_get_value(GPIO_PIN_PB(26));
-}
-
-static int ads7846_get_pendown_state_PB28(void)
-{
-       return !gpio_get_value(GPIO_PIN_PB(28));
-}
-
-static struct ads7846_platform_data __initdata ads7846_data = {
-       .model                          = 7846,
-       .vref_delay_usecs               = 100,
-       .vref_mv                        = 0,
-       .keep_vref_on                   = 0,
-       .settle_delay_usecs             = 150,
-       .penirq_recheck_delay_usecs     = 1,
-       .x_plate_ohms                   = 800,
-       .debounce_rep                   = 4,
-       .debounce_max                   = 10,
-       .debounce_tol                   = 50,
-       .get_pendown_state              = ads7846_get_pendown_state_PB26,
-       .filter_init                    = NULL,
-       .filter                         = NULL,
-       .filter_cleanup                 = NULL,
-};
-
-static struct spi_board_info __initdata spi0_board_info[] = {
-       {
-               .modalias       = "ads7846",
-               .max_speed_hz   = 3250000,
-               .chip_select    = 0,
-               .bus_num        = 0,
-               .platform_data  = &ads7846_data,
-               .mode           = SPI_MODE_0,
-       },
-};
-
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width              = 4,
-               .detect_pin             = GPIO_PIN_PE(19),
-               .wp_pin                 = GPIO_PIN_PE(20),
-               .detect_is_active_high  = true,
-       },
-};
-
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-       int i;
-
-       i = tag->u.ethernet.mac_index;
-       if (i < ARRAY_SIZE(hw_addr)) {
-               memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
-                      sizeof(hw_addr[i].addr));
-       }
-
-       return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
-static void __init set_hw_addr(struct platform_device *pdev)
-{
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       const u8 *addr;
-       void __iomem *regs;
-       struct clk *pclk;
-
-       if (!res)
-               return;
-
-       if (pdev->id >= ARRAY_SIZE(hw_addr))
-               return;
-
-       addr = hw_addr[pdev->id].addr;
-       if (!is_valid_ether_addr(addr))
-               return;
-
-       regs = (void __iomem __force *)res->start;
-       pclk = clk_get(&pdev->dev, "pclk");
-       if (IS_ERR(pclk))
-               return;
-
-       clk_enable(pclk);
-       __raw_writel((addr[3] << 24) | (addr[2] << 16)
-                    | (addr[1] << 8) | addr[0], regs + 0x98);
-       __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
-       clk_disable(pclk);
-       clk_put(pclk);
-}
-
-static struct i2c_gpio_platform_data i2c_gpio_data = {
-       .sda_pin                = GPIO_PIN_PA(6),
-       .scl_pin                = GPIO_PIN_PA(7),
-       .sda_is_open_drain      = 1,
-       .scl_is_open_drain      = 1,
-       .udelay                 = 2,
-};
-
-static struct platform_device i2c_gpio_device = {
-       .name   = "i2c-gpio",
-       .id     = 0,
-       .dev    = {
-               .platform_data  = &i2c_gpio_data,
-       },
-};
-
-static struct i2c_board_info __initdata i2c_info[] = {
-       {
-               I2C_BOARD_INFO("pcf8563", 0x51)
-       },
-};
-
-#if IS_ENABLED(CONFIG_LEDS_PWM)
-static struct pwm_lookup pwm_lookup[] = {
-       PWM_LOOKUP("at91sam9rl-pwm", 0, "leds_pwm", "backlight",
-                  5000, PWM_POLARITY_NORMAL),
-};
-
-static struct led_pwm pwm_leds[] = {
-       {
-               .name   = "backlight",
-               .max_brightness = 255,
-       },
-};
-
-static struct led_pwm_platform_data pwm_data = {
-       .num_leds       = ARRAY_SIZE(pwm_leds),
-       .leds           = pwm_leds,
-};
-
-static struct platform_device leds_pwm = {
-       .name   = "leds_pwm",
-       .id     = -1,
-       .dev    = {
-               .platform_data = &pwm_data,
-       },
-};
-#endif
-
-const char *merisc_model(void)
-{
-       switch (merisc_board_id) {
-       case 0:
-       case 1:
-               return "500-01";
-       case 2:
-               return "BT";
-       default:
-               return "Unknown";
-       }
-}
-
-const char *merisc_revision(void)
-{
-       switch (merisc_board_id) {
-       case 0:
-               return "B";
-       case 1:
-               return "D";
-       case 2:
-               return "A";
-       default:
-               return "Unknown";
-       }
-}
-
-static void detect_merisc_board_id(void)
-{
-       /* Board ID pins MUST be set as input or the board may be damaged */
-       at32_select_gpio(GPIO_PIN_PA(24), AT32_GPIOF_PULLUP);
-       at32_select_gpio(GPIO_PIN_PA(25), AT32_GPIOF_PULLUP);
-       at32_select_gpio(GPIO_PIN_PA(26), AT32_GPIOF_PULLUP);
-       at32_select_gpio(GPIO_PIN_PA(27), AT32_GPIOF_PULLUP);
-
-       merisc_board_id = !gpio_get_value(GPIO_PIN_PA(24)) +
-               !gpio_get_value(GPIO_PIN_PA(25)) * 2 +
-               !gpio_get_value(GPIO_PIN_PA(26)) * 4 +
-               !gpio_get_value(GPIO_PIN_PA(27)) * 8;
-}
-
-void __init setup_board(void)
-{
-       at32_map_usart(0, 0, 0);
-       at32_map_usart(1, 1, 0);
-       at32_map_usart(3, 3, 0);
-       at32_setup_serial_console(1);
-}
-
-static int __init merisc_init(void)
-{
-       detect_merisc_board_id();
-
-       printk(KERN_NOTICE "BOARD: Merisc %s revision %s\n", merisc_model(),
-              merisc_revision());
-
-       /* Reserve pins for SDRAM */
-       at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26));
-
-       if (merisc_board_id >= 1)
-               at32_map_usart(2, 2, 0);
-
-       at32_add_device_usart(0);
-       at32_add_device_usart(1);
-       if (merisc_board_id >= 1)
-               at32_add_device_usart(2);
-       at32_add_device_usart(3);
-       set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
-
-       /* ADS7846 PENIRQ */
-       if (merisc_board_id == 0) {
-               ads7846_data.get_pendown_state = ads7846_get_pendown_state_PB26;
-               at32_select_periph(GPIO_PIOB_BASE, 1 << 26,
-                                  GPIO_PERIPH_A, AT32_GPIOF_PULLUP);
-               spi0_board_info[0].irq = AT32_EXTINT(1);
-       } else {
-               ads7846_data.get_pendown_state = ads7846_get_pendown_state_PB28;
-               at32_select_periph(GPIO_PIOB_BASE, 1 << 28, GPIO_PERIPH_A,
-                                  AT32_GPIOF_PULLUP);
-               spi0_board_info[0].irq = AT32_EXTINT(3);
-       }
-
-       /* ADS7846 busy pin */
-       at32_select_gpio(GPIO_PIN_PA(4), AT32_GPIOF_PULLUP);
-
-       at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
-
-       at32_add_device_mci(0, &mci0_data);
-
-#if IS_ENABLED(CONFIG_LEDS_PWM)
-       pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
-       at32_add_device_pwm((1 << 0) | (1 << 2));
-       platform_device_register(&leds_pwm);
-#else
-       at32_add_device_pwm((1 << 2));
-#endif
-
-       at32_select_gpio(i2c_gpio_data.sda_pin,
-               AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
-       at32_select_gpio(i2c_gpio_data.scl_pin,
-               AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
-       platform_device_register(&i2c_gpio_device);
-
-       i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
-
-       return 0;
-}
-postcore_initcall(merisc_init);
diff --git a/arch/avr32/boards/mimc200/Makefile b/arch/avr32/boards/mimc200/Makefile
deleted file mode 100644 (file)
index c740aa1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y                          += setup.o flash.o
diff --git a/arch/avr32/boards/mimc200/flash.c b/arch/avr32/boards/mimc200/flash.c
deleted file mode 100644 (file)
index d83d650..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * MIMC200 board-specific flash initialization
- *
- * Copyright (C) 2008 Mercury IMC Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-
-#include <mach/smc.h>
-
-static struct smc_timing flash_timing __initdata = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 15,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 0,
-
-       .ncs_read_pulse         = 115,
-       .nrd_pulse              = 110,
-       .ncs_write_pulse        = 60,
-       .nwe_pulse              = 60,
-
-       .read_cycle             = 115,
-       .write_cycle            = 100,
-};
-
-static struct smc_config flash_config __initdata = {
-       .bus_width              = 2,
-       .nrd_controlled         = 1,
-       .nwe_controlled         = 1,
-       .byte_write             = 1,
-};
-
-/* system flash definition */
-
-static struct mtd_partition flash_parts_system[] = {
-       {
-               .name           = "u-boot",
-               .offset         = 0x00000000,
-               .size           = 0x00020000,           /* 128 KiB */
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "root",
-               .offset         = 0x00020000,
-               .size           = 0x007c0000,
-       },
-       {
-               .name           = "splash",
-               .offset         = 0x007e0000,
-               .size           = 0x00010000,           /* 64KiB */
-       },
-       {
-               .name           = "env",
-               .offset         = 0x007f0000,
-               .size           = 0x00010000,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-};
-
-static struct physmap_flash_data flash_system = {
-       .width          = 2,
-       .nr_parts       = ARRAY_SIZE(flash_parts_system),
-       .parts          = flash_parts_system,
-};
-
-static struct resource flash_resource_system = {
-       .start          = 0x00000000,
-       .end            = 0x007fffff,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device_system = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .resource       = &flash_resource_system,
-       .num_resources  = 1,
-       .dev            = {
-               .platform_data = &flash_system,
-       },
-};
-
-/* data flash definition */
-
-static struct mtd_partition flash_parts_data[] = {
-       {
-               .name           = "data",
-               .offset         = 0x00000000,
-               .size           = 0x00800000,
-       },
-};
-
-static struct physmap_flash_data flash_data = {
-       .width          = 2,
-       .nr_parts       = ARRAY_SIZE(flash_parts_data),
-       .parts          = flash_parts_data,
-};
-
-static struct resource flash_resource_data = {
-       .start          = 0x08000000,
-       .end            = 0x087fffff,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device_data = {
-       .name           = "physmap-flash",
-       .id             = 1,
-       .resource       = &flash_resource_data,
-       .num_resources  = 1,
-       .dev            = {
-               .platform_data = &flash_data,
-       },
-};
-
-/* This needs to be called after the SMC has been initialized */
-static int __init mimc200_flash_init(void)
-{
-       int ret;
-
-       smc_set_timing(&flash_config, &flash_timing);
-       ret = smc_set_configuration(0, &flash_config);
-       if (ret < 0) {
-               printk(KERN_ERR "mimc200: failed to set 'System' NOR flash timing\n");
-               return ret;
-       }
-       ret = smc_set_configuration(1, &flash_config);
-       if (ret < 0) {
-               printk(KERN_ERR "mimc200: failed to set 'Data' NOR flash timing\n");
-               return ret;
-       }
-
-       platform_device_register(&flash_device_system);
-       platform_device_register(&flash_device_data);
-
-       return 0;
-}
-device_initcall(mimc200_flash_init);
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
deleted file mode 100644 (file)
index 1cb8e9c..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Board-specific setup code for the MIMC200
- *
- * Copyright (C) 2008 Mercury IMC Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-extern struct atmel_lcdfb_pdata mimc200_lcdc_data;
-
-#include <linux/clk.h>
-#include <linux/etherdevice.h>
-#include <linux/i2c-gpio.h>
-#include <linux/init.h>
-#include <linux/linkage.h>
-#include <linux/platform_device.h>
-#include <linux/types.h>
-#include <linux/leds.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/eeprom.h>
-
-#include <video/atmel_lcdc.h>
-#include <linux/fb.h>
-
-#include <linux/atmel-mci.h>
-#include <linux/io.h>
-#include <asm/setup.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] = {
-       [0] = 32768,    /* 32.768 kHz on RTC osc */
-       [1] = 10000000, /* 10 MHz on osc0 */
-       [2] = 12000000, /* 12 MHz on osc1 */
-};
-
-/* Initialized by bootloader-specific startup code. */
-struct tag *bootloader_tags __initdata;
-
-static struct fb_videomode __initdata pt0434827_modes[] = {
-       {
-               .name           = "480x272 @ 72",
-               .refresh        = 72,
-               .xres           = 480,          .yres           = 272,
-               .pixclock       = KHZ2PICOS(10000),
-
-               .left_margin    = 1,            .right_margin   = 1,
-               .upper_margin   = 12,           .lower_margin   = 1,
-               .hsync_len      = 42,           .vsync_len      = 1,
-
-               .sync           = 0,
-               .vmode          = FB_VMODE_NONINTERLACED,
-       },
-};
-
-static struct fb_monspecs __initdata mimc200_default_monspecs = {
-       .manufacturer           = "PT",
-       .monitor                = "PT0434827-A401",
-       .modedb                 = pt0434827_modes,
-       .modedb_len             = ARRAY_SIZE(pt0434827_modes),
-       .hfmin                  = 14820,
-       .hfmax                  = 22230,
-       .vfmin                  = 60,
-       .vfmax                  = 85,
-       .dclkmax                = 25200000,
-};
-
-struct atmel_lcdfb_pdata __initdata mimc200_lcdc_data = {
-       .default_bpp            = 16,
-       .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
-       .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
-                                  | ATMEL_LCDC_INVCLK
-                                  | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
-                                  | ATMEL_LCDC_MEMOR_BIG),
-       .default_monspecs       = &mimc200_default_monspecs,
-       .guard_time             = 2,
-};
-
-struct eth_addr {
-       u8 addr[6];
-};
-static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2];
-
-static struct spi_eeprom eeprom_25lc010 = {
-               .name = "25lc010",
-               .byte_len = 128,
-               .page_size = 16,
-               .flags = EE_ADDR1,
-};
-
-static struct spi_board_info spi0_board_info[] __initdata = {
-       {
-               .modalias       = "rtc-ds1390",
-               .max_speed_hz   = 4000000,
-               .chip_select    = 2,
-       },
-       {
-               .modalias       = "at25",
-               .max_speed_hz   = 1000000,
-               .chip_select    = 1,
-               .mode           = SPI_MODE_3,
-               .platform_data  = &eeprom_25lc010,
-       },
-};
-
-static struct mci_platform_data __initdata mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = GPIO_PIN_PA(26),
-               .wp_pin         = GPIO_PIN_PA(27),
-       },
-};
-
-/*
- * The next two functions should go away as the boot loader is
- * supposed to initialize the macb address registers with a valid
- * ethernet address. But we need to keep it around for a while until
- * we can be reasonably sure the boot loader does this.
- *
- * The phy_id is ignored as the driver will probe for it.
- */
-static int __init parse_tag_ethernet(struct tag *tag)
-{
-       int i;
-
-       i = tag->u.ethernet.mac_index;
-       if (i < ARRAY_SIZE(hw_addr))
-               memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
-                      sizeof(hw_addr[i].addr));
-
-       return 0;
-}
-__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
-
-static void __init set_hw_addr(struct platform_device *pdev)
-{
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       const u8 *addr;
-       void __iomem *regs;
-       struct clk *pclk;
-
-       if (!res)
-               return;
-       if (pdev->id >= ARRAY_SIZE(hw_addr))
-               return;
-
-       addr = hw_addr[pdev->id].addr;
-       if (!is_valid_ether_addr(addr))
-               return;
-
-       /*
-        * Since this is board-specific code, we'll cheat and use the
-        * physical address directly as we happen to know that it's
-        * the same as the virtual address.
-        */
-       regs = (void __iomem __force *)res->start;
-       pclk = clk_get(&pdev->dev, "pclk");
-       if (IS_ERR(pclk))
-               return;
-
-       clk_enable(pclk);
-       __raw_writel((addr[3] << 24) | (addr[2] << 16)
-                    | (addr[1] << 8) | addr[0], regs + 0x98);
-       __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
-       clk_disable(pclk);
-       clk_put(pclk);
-}
-
-void __init setup_board(void)
-{
-       at32_map_usart(0, 0, 0);        /* USART 0: /dev/ttyS0 (TTL --> Altera) */
-       at32_map_usart(1, 1, 0);        /* USART 1: /dev/ttyS1 (RS232) */
-       at32_map_usart(2, 2, 0);        /* USART 2: /dev/ttyS2 (RS485) */
-       at32_map_usart(3, 3, 0);        /* USART 3: /dev/ttyS3 (RS422 Multidrop) */
-}
-
-static struct i2c_gpio_platform_data i2c_gpio_data = {
-       .sda_pin                = GPIO_PIN_PA(6),
-       .scl_pin                = GPIO_PIN_PA(7),
-       .sda_is_open_drain      = 1,
-       .scl_is_open_drain      = 1,
-       .udelay                 = 2,    /* close to 100 kHz */
-};
-
-static struct platform_device i2c_gpio_device = {
-       .name           = "i2c-gpio",
-       .id             = 0,
-       .dev            = {
-       .platform_data  = &i2c_gpio_data,
-       },
-};
-
-static struct i2c_board_info __initdata i2c_info[] = {
-};
-
-static int __init mimc200_init(void)
-{
-       /*
-        * MIMC200 uses 16-bit SDRAM interface, so we don't need to
-        * reserve any pins for it.
-        */
-
-       at32_add_device_usart(0);
-       at32_add_device_usart(1);
-       at32_add_device_usart(2);
-       at32_add_device_usart(3);
-
-       set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
-       set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
-
-       at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
-       at32_add_device_mci(0, &mci0_data);
-       at32_add_device_usba(0, NULL);
-
-       at32_select_periph(GPIO_PIOB_BASE, 1 << 28, 0, AT32_GPIOF_PULLUP);
-       at32_select_gpio(i2c_gpio_data.sda_pin,
-               AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
-       at32_select_gpio(i2c_gpio_data.scl_pin,
-               AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
-       platform_device_register(&i2c_gpio_device);
-       i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
-
-       at32_add_device_lcdc(0, &mimc200_lcdc_data,
-                            fbmem_start, fbmem_size,
-                            ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_CONTROL | ATMEL_LCDC_ALT_24B_DATA);
-
-       return 0;
-}
-postcore_initcall(mimc200_init);
diff --git a/arch/avr32/boot/images/.gitignore b/arch/avr32/boot/images/.gitignore
deleted file mode 100644 (file)
index 64ea9d0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-uImage
-uImage.srec
-vmlinux.cso
-sfdwarf.log
diff --git a/arch/avr32/boot/images/Makefile b/arch/avr32/boot/images/Makefile
deleted file mode 100644 (file)
index 2a3b539..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2004-2006 Atmel Corporation
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-
-extra-y                := vmlinux.bin vmlinux.gz
-
-OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note.gnu.build-id
-$(obj)/vmlinux.bin: vmlinux FORCE
-       $(call if_changed,objcopy)
-
-$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
-       $(call if_changed,gzip)
-
-UIMAGE_LOADADDR = $(CONFIG_LOAD_ADDRESS)
-UIMAGE_ENTRYADDR = $(CONFIG_ENTRY_ADDRESS)
-UIMAGE_COMPRESSION = gzip
-
-targets += uImage uImage.srec
-$(obj)/uImage: $(obj)/vmlinux.gz
-       $(call if_changed,uimage)
-       @echo '  Image $@ is ready'
-
-OBJCOPYFLAGS_uImage.srec := -I binary -O srec
-$(obj)/uImage.srec: $(obj)/uImage
-       $(call if_changed,objcopy)
-
-OBJCOPYFLAGS_vmlinux.elf := --change-section-lma .text-0x80000000 \
-                           --change-section-lma __ex_table-0x80000000 \
-                           --change-section-lma .rodata-0x80000000 \
-                           --change-section-lma .data-0x80000000 \
-                           --change-section-lma .init-0x80000000 \
-                           --change-section-lma .bss-0x80000000 \
-                           --change-section-lma __param-0x80000000 \
-                           --change-section-lma __ksymtab-0x80000000 \
-                           --change-section-lma __ksymtab_gpl-0x80000000 \
-                           --change-section-lma __kcrctab-0x80000000 \
-                           --change-section-lma __kcrctab_gpl-0x80000000 \
-                           --change-section-lma __ksymtab_strings-0x80000000 \
-                           --set-start 0xa0000000
-$(obj)/vmlinux.elf: vmlinux FORCE
-       $(call if_changed,objcopy)
-
-quiet_cmd_sfdwarf = SFDWARF $@
-      cmd_sfdwarf = sfdwarf $< TO $@ GNUAVR IW $(SFDWARF_FLAGS) > $(obj)/sfdwarf.log
-
-$(obj)/vmlinux.cso: $(obj)/vmlinux.elf FORCE
-       $(call if_changed,sfdwarf)
-
-install: $(BOOTIMAGE)
-       sh $(srctree)/install-kernel.sh $<
-
-# Generated files to be removed upon make clean
-clean-files    := vmlinux.elf vmlinux.bin vmlinux.gz uImage uImage.srec
diff --git a/arch/avr32/boot/u-boot/Makefile b/arch/avr32/boot/u-boot/Makefile
deleted file mode 100644 (file)
index 125ddc9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-extra-y                := head.o
-
-obj-y          := empty.o
diff --git a/arch/avr32/boot/u-boot/empty.S b/arch/avr32/boot/u-boot/empty.S
deleted file mode 100644 (file)
index 8ac91a5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty file */
diff --git a/arch/avr32/boot/u-boot/head.S b/arch/avr32/boot/u-boot/head.S
deleted file mode 100644 (file)
index 2ffc298..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Startup code for use with the u-boot bootloader.
- *
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <asm/setup.h>
-#include <asm/thread_info.h>
-#include <asm/sysreg.h>
-
-       /*
-        * The kernel is loaded where we want it to be and all caches
-        * have just been flushed. We get two parameters from u-boot:
-        *
-        * r12 contains a magic number (ATAG_MAGIC)
-        * r11 points to a tag table providing information about
-        *     the system.
-        */
-       .section .init.text,"ax"
-       .global _start
-_start:
-       /* Initialize .bss */
-       lddpc   r2, bss_start_addr
-       lddpc   r3, end_addr
-       mov     r0, 0
-       mov     r1, 0
-1:      st.d    r2++, r0
-       cp      r2, r3
-       brlo    1b
-
-       /* Initialize status register */
-       lddpc   r0, init_sr
-       mtsr    SYSREG_SR, r0
-
-       /* Set initial stack pointer */
-       lddpc   sp, stack_addr
-       sub     sp, -THREAD_SIZE
-
-#ifdef CONFIG_FRAME_POINTER
-       /* Mark last stack frame */
-       mov     lr, 0
-       mov     r7, 0
-#endif
-
-       /* Check if the boot loader actually provided a tag table */
-       lddpc   r0, magic_number
-       cp.w    r12, r0
-       brne    no_tag_table
-
-       /*
-        * Save the tag table address for later use. This must be done
-        * _after_ .bss has been initialized...
-        */
-       lddpc   r0, tag_table_addr
-       st.w    r0[0], r11
-
-       /* Jump to loader-independent setup code */
-       rjmp    kernel_entry
-
-       .align  2
-magic_number:
-       .long   ATAG_MAGIC
-tag_table_addr:
-       .long   bootloader_tags
-bss_start_addr:
-       .long   __bss_start
-end_addr:
-       .long   _end
-init_sr:
-       .long   0x007f0000      /* Supervisor mode, everything masked */
-stack_addr:
-       .long   init_thread_union
-panic_addr:
-       .long   panic
-
-no_tag_table:
-       sub     r12, pc, (. - 2f)
-       /* branch to panic() which can be far away with that construct */
-       lddpc   pc, panic_addr
-2:     .asciz  "Boot loader didn't provide correct magic number\n"
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
deleted file mode 100644 (file)
index ce00300..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATNGW100_MKI=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_INPUT is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=350
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig
deleted file mode 100644 (file)
index 01ff632..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATNGW100_MKI=y
-CONFIG_BOARD_ATNGW100_EVKLCD10X=y
-CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_SERIO is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_HRTIMER=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_ATMEL_AC97C=m
-# CONFIG_SND_SPI is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=350
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig
deleted file mode 100644 (file)
index c4021df..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATNGW100_MKI=y
-CONFIG_BOARD_ATNGW100_EVKLCD10X=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_SERIO is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_HRTIMER=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_ATMEL_AC97C=m
-# CONFIG_SND_SPI is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=350
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig
deleted file mode 100644 (file)
index ffcc28d..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_SLUB_DEBUG is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_OWNERSHIP_TRACE is not set
-# CONFIG_SUSPEND is not set
-CONFIG_PM=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NETDEVICES=y
-CONFIG_MACB=y
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_GPIO=y
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=y
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-CONFIG_SND_ATMEL_AC97C=m
-# CONFIG_SND_SPI is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_MMC=y
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_AT32AP700X=m
-CONFIG_DMADEVICES=y
-CONFIG_UIO=y
-CONFIG_PWM=y
-CONFIG_PWM_ATMEL=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_CRC_CCITT=y
diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig
deleted file mode 100644 (file)
index 0496264..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATNGW100_MKII=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_INPUT is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=350
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
deleted file mode 100644 (file)
index 89c2cda..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATNGW100_MKII=y
-CONFIG_BOARD_ATNGW100_MKII_LCD=y
-CONFIG_BOARD_ATNGW100_EVKLCD10X=y
-CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_SERIO is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_HRTIMER=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_ATMEL_AC97C=m
-# CONFIG_SND_SPI is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=350
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
deleted file mode 100644 (file)
index 1b4d4a8..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATNGW100_MKII=y
-CONFIG_BOARD_ATNGW100_MKII_LCD=y
-CONFIG_BOARD_ATNGW100_EVKLCD10X=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_SERIO is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_HRTIMER=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_ATMEL_AC97C=m
-# CONFIG_SND_SPI is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=350
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
deleted file mode 100644 (file)
index 9b8b52e..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=m
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-# CONFIG_INET_LRO is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_BRIDGE=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_ATMEL_SSC=m
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=m
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_AT32=m
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_ASYNC=m
-CONFIG_INPUT=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_MOUSE_GPIO=m
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_LTV350QV=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-CONFIG_SND_AT73C213=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_PWM=y
-CONFIG_PWM_ATMEL=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig
deleted file mode 100644 (file)
index ccce1a0..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATSTK1003=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_ATMEL_SSC=m
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=m
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_AT32=m
-CONFIG_NETDEVICES=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_ASYNC=m
-CONFIG_INPUT=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_MOUSE_GPIO=m
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_AT73C213=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_PWM=y
-CONFIG_PWM_ATMEL=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig
deleted file mode 100644 (file)
index e64288f..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATSTK1004=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_ATMEL_SSC=m
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=m
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_AT32=m
-CONFIG_NETDEVICES=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_ASYNC=m
-CONFIG_INPUT=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_MOUSE_GPIO=m
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_LTV350QV=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_PWM=y
-CONFIG_PWM_ATMEL=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
deleted file mode 100644 (file)
index 7d669f7..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_ATSTK1006=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=m
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-# CONFIG_INET_LRO is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_BRIDGE=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_ATMEL_SSC=m
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=m
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_AT32=m
-CONFIG_NETDEVICES=y
-CONFIG_TUN=m
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_ASYNC=m
-CONFIG_INPUT=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_MOUSE_GPIO=m
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_LTV350QV=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-CONFIG_SND_AT73C213=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_TEST=m
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_PWM=y
-CONFIG_PWM_ATMEL=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_CIFS=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig
deleted file mode 100644 (file)
index 560c52f..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_FAVR_32=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=m
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_NET_IPIP=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_BRIDGE=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_ATMEL_SSC=m
-CONFIG_NETDEVICES=y
-CONFIG_MACB=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_ASYNC=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_MOUSE_GPIO=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_SOUND=m
-CONFIG_SOUND_PRIME=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_MMC=y
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_DMADEVICES=y
-CONFIG_PWM=y
-CONFIG_PWM_ATMEL=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_FS_WRITEBUFFER is not set
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_DEBUG_FS=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_CRYPTO_HW is not set
diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig
deleted file mode 100644 (file)
index d57fadb..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_HAMMERHEAD=y
-CONFIG_BOARD_HAMMERHEAD_USB=y
-CONFIG_BOARD_HAMMERHEAD_LCD=y
-CONFIG_BOARD_HAMMERHEAD_SND=y
-# CONFIG_BOARD_HAMMERHEAD_FPGA is not set
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_TCLIB=y
-CONFIG_SCSI=m
-CONFIG_BLK_DEV_SD=m
-CONFIG_NETDEVICES=y
-CONFIG_MACB=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=m
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_USB=m
-CONFIG_USB_MON=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_MMC=m
-CONFIG_MMC_ATMELMCI=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-CONFIG_EXT2_FS=m
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_UTF8=m
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_ARC4=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC7=m
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig
deleted file mode 100644 (file)
index e6a9cb7..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_MERISC=y
-CONFIG_AP700X_32_BIT_SMC=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
-CONFIG_CAN=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_ABSENT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_BLOCK2MTD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_ATMEL_SSC=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_NETDEVICES=y
-CONFIG_MACB=y
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-# CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_GPIO=y
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-CONFIG_MMC=y
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_PWM=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_HCTOSYS is not set
-CONFIG_RTC_DRV_PCF8563=y
-CONFIG_DMADEVICES=y
-CONFIG_UIO=y
-CONFIG_PWM=y
-CONFIG_PWM_ATMEL=m
-CONFIG_EXT2_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_WBUF_VERIFY=y
-CONFIG_CRAMFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig
deleted file mode 100644 (file)
index 49c7e89..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_BASE_FULL is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_BOARD_MIMC200=y
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_NMI_DEBUGGING=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_AVR32_AT32AP_CPUFREQ=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-# CONFIG_INET_LRO is not set
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_ATMEL_TCLIB=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_NETDEVICES=y
-CONFIG_MACB=y
-# CONFIG_INPUT is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_GPIO=y
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT32AP700X_WDT=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_TEST=y
-CONFIG_MMC_ATMELMCI=y
-CONFIG_MMC_SPI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1390=y
-CONFIG_DMADEVICES=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_JFFS2_FS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
-CONFIG_FRAME_POINTER=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRC_CCITT=y
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild
deleted file mode 100644 (file)
index 3d7ef2c..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-generic-y += clkdev.h
-generic-y += delay.h
-generic-y += device.h
-generic-y += div64.h
-generic-y += emergency-restart.h
-generic-y += exec.h
-generic-y += futex.h
-generic-y += irq_regs.h
-generic-y += irq_work.h
-generic-y += local.h
-generic-y += local64.h
-generic-y += mcs_spinlock.h
-generic-y += mm-arch-hooks.h
-generic-y += param.h
-generic-y += percpu.h
-generic-y += preempt.h
-generic-y += sections.h
-generic-y += topology.h
-generic-y += trace_clock.h
-generic-y += vga.h
-generic-y += word-at-a-time.h
-generic-y += xor.h
diff --git a/arch/avr32/include/asm/addrspace.h b/arch/avr32/include/asm/addrspace.h
deleted file mode 100644 (file)
index 5a47a79..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Definitions for the address spaces of the AVR32 CPUs. Heavily based on
- * include/asm-sh/addrspace.h
- *
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_ADDRSPACE_H
-#define __ASM_AVR32_ADDRSPACE_H
-
-#ifdef CONFIG_MMU
-
-/* Memory segments when segmentation is enabled */
-#define P0SEG          0x00000000
-#define P1SEG          0x80000000
-#define P2SEG          0xa0000000
-#define P3SEG          0xc0000000
-#define P4SEG          0xe0000000
-
-/* Returns the privileged segment base of a given address */
-#define PXSEG(a)       (((unsigned long)(a)) & 0xe0000000)
-
-/* Returns the physical address of a PnSEG (n=1,2) address */
-#define PHYSADDR(a)    (((unsigned long)(a)) & 0x1fffffff)
-
-/*
- * Map an address to a certain privileged segment
- */
-#define P1SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
-                                     | P1SEG))
-#define P2SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
-                                     | P2SEG))
-#define P3SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
-                                     | P3SEG))
-#define P4SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
-                                     | P4SEG))
-
-#endif /* CONFIG_MMU */
-
-#endif /* __ASM_AVR32_ADDRSPACE_H */
diff --git a/arch/avr32/include/asm/asm-offsets.h b/arch/avr32/include/asm/asm-offsets.h
deleted file mode 100644 (file)
index d370ee3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <generated/asm-offsets.h>
diff --git a/arch/avr32/include/asm/asm.h b/arch/avr32/include/asm/asm.h
deleted file mode 100644 (file)
index a2c64f4..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_ASM_H__
-#define __ASM_AVR32_ASM_H__
-
-#include <asm/sysreg.h>
-#include <asm/asm-offsets.h>
-#include <asm/thread_info.h>
-
-#define mask_interrupts                ssrf    SYSREG_GM_OFFSET
-#define mask_exceptions                ssrf    SYSREG_EM_OFFSET
-#define unmask_interrupts      csrf    SYSREG_GM_OFFSET
-#define unmask_exceptions      csrf    SYSREG_EM_OFFSET
-
-#ifdef CONFIG_FRAME_POINTER
-       .macro  save_fp
-       st.w    --sp, r7
-       .endm
-       .macro  restore_fp
-       ld.w    r7, sp++
-       .endm
-       .macro  zero_fp
-       mov     r7, 0
-       .endm
-#else
-       .macro  save_fp
-       .endm
-       .macro  restore_fp
-       .endm
-       .macro  zero_fp
-       .endm
-#endif
-       .macro  get_thread_info reg
-       mov     \reg, sp
-       andl    \reg, ~(THREAD_SIZE - 1) & 0xffff
-       .endm
-
-       /* Save and restore registers */
-       .macro  save_min sr, tmp=lr
-       pushm   lr
-       mfsr    \tmp, \sr
-       zero_fp
-       st.w    --sp, \tmp
-       .endm
-
-       .macro  restore_min sr, tmp=lr
-       ld.w    \tmp, sp++
-       mtsr    \sr, \tmp
-       popm    lr
-       .endm
-
-       .macro  save_half sr, tmp=lr
-       save_fp
-       pushm   r8-r9,r10,r11,r12,lr
-       zero_fp
-       mfsr    \tmp, \sr
-       st.w    --sp, \tmp
-       .endm
-
-       .macro  restore_half sr, tmp=lr
-       ld.w    \tmp, sp++
-       mtsr    \sr, \tmp
-       popm    r8-r9,r10,r11,r12,lr
-       restore_fp
-       .endm
-
-       .macro  save_full_user sr, tmp=lr
-       stmts   --sp, r0,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r12,sp,lr
-       st.w    --sp, lr
-       zero_fp
-       mfsr    \tmp, \sr
-       st.w    --sp, \tmp
-       .endm
-
-       .macro  restore_full_user sr, tmp=lr
-       ld.w    \tmp, sp++
-       mtsr    \sr, \tmp
-       ld.w    lr, sp++
-       ldmts   sp++, r0,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r12,sp,lr
-       .endm
-
-       /* uaccess macros */
-       .macro branch_if_kernel scratch, label
-       get_thread_info \scratch
-       ld.w    \scratch, \scratch[TI_flags]
-       bld     \scratch, TIF_USERSPACE
-       brcc    \label
-       .endm
-
-       .macro ret_if_privileged scratch, addr, size, ret
-       sub     \scratch, \size, 1
-       add     \scratch, \addr
-       retcs   \ret
-       retmi   \ret
-       .endm
-
-#endif /* __ASM_AVR32_ASM_H__ */
diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h
deleted file mode 100644 (file)
index 3d5ce38..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc.
- *
- * But use these as seldom as possible since they are slower than
- * regular operations.
- *
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_ATOMIC_H
-#define __ASM_AVR32_ATOMIC_H
-
-#include <linux/types.h>
-#include <asm/cmpxchg.h>
-
-#define ATOMIC_INIT(i)  { (i) }
-
-#define atomic_read(v)         READ_ONCE((v)->counter)
-#define atomic_set(v, i)       WRITE_ONCE(((v)->counter), (i))
-
-#define ATOMIC_OP_RETURN(op, asm_op, asm_con)                          \
-static inline int __atomic_##op##_return(int i, atomic_t *v)           \
-{                                                                      \
-       int result;                                                     \
-                                                                       \
-       asm volatile(                                                   \
-               "/* atomic_" #op "_return */\n"                         \
-               "1:     ssrf    5\n"                                    \
-               "       ld.w    %0, %2\n"                               \
-               "       " #asm_op "     %0, %3\n"                       \
-               "       stcond  %1, %0\n"                               \
-               "       brne    1b"                                     \
-               : "=&r" (result), "=o" (v->counter)                     \
-               : "m" (v->counter), #asm_con (i)                        \
-               : "cc");                                                \
-                                                                       \
-       return result;                                                  \
-}
-
-#define ATOMIC_FETCH_OP(op, asm_op, asm_con)                           \
-static inline int __atomic_fetch_##op(int i, atomic_t *v)              \
-{                                                                      \
-       int result, val;                                                \
-                                                                       \
-       asm volatile(                                                   \
-               "/* atomic_fetch_" #op " */\n"                          \
-               "1:     ssrf    5\n"                                    \
-               "       ld.w    %0, %3\n"                               \
-               "       mov     %1, %0\n"                               \
-               "       " #asm_op "     %1, %4\n"                       \
-               "       stcond  %2, %1\n"                               \
-               "       brne    1b"                                     \
-               : "=&r" (result), "=&r" (val), "=o" (v->counter)        \
-               : "m" (v->counter), #asm_con (i)                        \
-               : "cc");                                                \
-                                                                       \
-       return result;                                                  \
-}
-
-ATOMIC_OP_RETURN(sub, sub, rKs21)
-ATOMIC_OP_RETURN(add, add, r)
-ATOMIC_FETCH_OP (sub, sub, rKs21)
-ATOMIC_FETCH_OP (add, add, r)
-
-#define ATOMIC_OPS(op, asm_op)                                         \
-ATOMIC_OP_RETURN(op, asm_op, r)                                                \
-static inline void atomic_##op(int i, atomic_t *v)                     \
-{                                                                      \
-       (void)__atomic_##op##_return(i, v);                             \
-}                                                                      \
-ATOMIC_FETCH_OP(op, asm_op, r)                                         \
-static inline int atomic_fetch_##op(int i, atomic_t *v)                \
-{                                                                      \
-       return __atomic_fetch_##op(i, v);                               \
-}
-
-ATOMIC_OPS(and, and)
-ATOMIC_OPS(or, or)
-ATOMIC_OPS(xor, eor)
-
-#undef ATOMIC_OPS
-#undef ATOMIC_FETCH_OP
-#undef ATOMIC_OP_RETURN
-
-/*
- * Probably found the reason why we want to use sub with the signed 21-bit
- * limit, it uses one less register than the add instruction that can add up to
- * 32-bit values.
- *
- * Both instructions are 32-bit, to use a 16-bit instruction the immediate is
- * very small; 4 bit.
- *
- * sub 32-bit, type IV, takes a register and subtracts a 21-bit immediate.
- * add 32-bit, type II, adds two register values together.
- */
-#define IS_21BIT_CONST(i)                                              \
-       (__builtin_constant_p(i) && ((i) >= -1048575) && ((i) <= 1048576))
-
-/*
- * atomic_add_return - add integer to atomic variable
- * @i: integer value to add
- * @v: pointer of type atomic_t
- *
- * Atomically adds @i to @v. Returns the resulting value.
- */
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-       if (IS_21BIT_CONST(i))
-               return __atomic_sub_return(-i, v);
-
-       return __atomic_add_return(i, v);
-}
-
-static inline int atomic_fetch_add(int i, atomic_t *v)
-{
-       if (IS_21BIT_CONST(i))
-               return __atomic_fetch_sub(-i, v);
-
-       return __atomic_fetch_add(i, v);
-}
-
-/*
- * atomic_sub_return - subtract the atomic variable
- * @i: integer value to subtract
- * @v: pointer of type atomic_t
- *
- * Atomically subtracts @i from @v. Returns the resulting value.
- */
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-       if (IS_21BIT_CONST(i))
-               return __atomic_sub_return(i, v);
-
-       return __atomic_add_return(-i, v);
-}
-
-static inline int atomic_fetch_sub(int i, atomic_t *v)
-{
-       if (IS_21BIT_CONST(i))
-               return __atomic_fetch_sub(i, v);
-
-       return __atomic_fetch_add(-i, v);
-}
-
-/*
- * __atomic_add_unless - add unless the number is a given value
- * @v: pointer of type atomic_t
- * @a: the amount to add to v...
- * @u: ...unless v is equal to u.
- *
- * Atomically adds @a to @v, so long as it was not @u.
- * Returns the old value of @v.
-*/
-static inline int __atomic_add_unless(atomic_t *v, int a, int u)
-{
-       int tmp, old = atomic_read(v);
-
-       if (IS_21BIT_CONST(a)) {
-               asm volatile(
-                       "/* __atomic_sub_unless */\n"
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %2\n"
-                       "       cp.w    %0, %4\n"
-                       "       breq    1f\n"
-                       "       sub     %0, %3\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b\n"
-                       "1:"
-                       : "=&r"(tmp), "=o"(v->counter)
-                       : "m"(v->counter), "rKs21"(-a), "rKs21"(u)
-                       : "cc", "memory");
-       } else {
-               asm volatile(
-                       "/* __atomic_add_unless */\n"
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %2\n"
-                       "       cp.w    %0, %4\n"
-                       "       breq    1f\n"
-                       "       add     %0, %3\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b\n"
-                       "1:"
-                       : "=&r"(tmp), "=o"(v->counter)
-                       : "m"(v->counter), "r"(a), "ir"(u)
-                       : "cc", "memory");
-       }
-
-       return old;
-}
-
-#undef IS_21BIT_CONST
-
-/*
- * atomic_sub_if_positive - conditionally subtract integer from atomic variable
- * @i: integer value to subtract
- * @v: pointer of type atomic_t
- *
- * Atomically test @v and subtract @i if @v is greater or equal than @i.
- * The function returns the old value of @v minus @i.
- */
-static inline int atomic_sub_if_positive(int i, atomic_t *v)
-{
-       int result;
-
-       asm volatile(
-               "/* atomic_sub_if_positive */\n"
-               "1:     ssrf    5\n"
-               "       ld.w    %0, %2\n"
-               "       sub     %0, %3\n"
-               "       brlt    1f\n"
-               "       stcond  %1, %0\n"
-               "       brne    1b\n"
-               "1:"
-               : "=&r"(result), "=o"(v->counter)
-               : "m"(v->counter), "ir"(i)
-               : "cc", "memory");
-
-       return result;
-}
-
-#define atomic_xchg(v, new)    (xchg(&((v)->counter), new))
-#define atomic_cmpxchg(v, o, n)        (cmpxchg(&((v)->counter), (o), (n)))
-
-#define atomic_sub(i, v)       (void)atomic_sub_return(i, v)
-#define atomic_add(i, v)       (void)atomic_add_return(i, v)
-#define atomic_dec(v)          atomic_sub(1, (v))
-#define atomic_inc(v)          atomic_add(1, (v))
-
-#define atomic_dec_return(v)   atomic_sub_return(1, v)
-#define atomic_inc_return(v)   atomic_add_return(1, v)
-
-#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
-#define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
-#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
-#define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
-
-#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
-
-#endif /*  __ASM_AVR32_ATOMIC_H */
diff --git a/arch/avr32/include/asm/barrier.h b/arch/avr32/include/asm/barrier.h
deleted file mode 100644 (file)
index 7151007..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_BARRIER_H
-#define __ASM_AVR32_BARRIER_H
-
-/*
- * Weirdest thing ever.. no full barrier, but it has a write barrier!
- */
-#define wmb()  asm volatile("sync 0" : : : "memory")
-
-#ifdef CONFIG_SMP
-# error "The AVR32 port does not support SMP"
-#endif
-
-#include <asm-generic/barrier.h>
-
-#endif /* __ASM_AVR32_BARRIER_H */
diff --git a/arch/avr32/include/asm/bitops.h b/arch/avr32/include/asm/bitops.h
deleted file mode 100644 (file)
index 910d537..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_BITOPS_H
-#define __ASM_AVR32_BITOPS_H
-
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-
-#include <asm/byteorder.h>
-#include <asm/barrier.h>
-
-/*
- * set_bit - Atomically set a bit in memory
- * @nr: the bit to set
- * @addr: the address to start counting from
- *
- * This function is atomic and may not be reordered.  See __set_bit()
- * if you do not require the atomic guarantees.
- *
- * Note that @nr may be almost arbitrarily large; this function is not
- * restricted to acting on a single-word quantity.
- */
-static inline void set_bit(int nr, volatile void * addr)
-{
-       unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
-       unsigned long tmp;
-
-       if (__builtin_constant_p(nr)) {
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %2\n"
-                       "       sbr     %0, %3\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p)
-                       : "m"(*p), "i"(nr)
-                       : "cc");
-       } else {
-               unsigned long mask = 1UL << (nr % BITS_PER_LONG);
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %2\n"
-                       "       or      %0, %3\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p)
-                       : "m"(*p), "r"(mask)
-                       : "cc");
-       }
-}
-
-/*
- * clear_bit - Clears a bit in memory
- * @nr: Bit to clear
- * @addr: Address to start counting from
- *
- * clear_bit() is atomic and may not be reordered.  However, it does
- * not contain a memory barrier, so if it is used for locking purposes,
- * you should call smp_mb__before_atomic() and/or smp_mb__after_atomic()
- * in order to ensure changes are visible on other processors.
- */
-static inline void clear_bit(int nr, volatile void * addr)
-{
-       unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
-       unsigned long tmp;
-
-       if (__builtin_constant_p(nr)) {
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %2\n"
-                       "       cbr     %0, %3\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p)
-                       : "m"(*p), "i"(nr)
-                       : "cc");
-       } else {
-               unsigned long mask = 1UL << (nr % BITS_PER_LONG);
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %2\n"
-                       "       andn    %0, %3\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p)
-                       : "m"(*p), "r"(mask)
-                       : "cc");
-       }
-}
-
-/*
- * change_bit - Toggle a bit in memory
- * @nr: Bit to change
- * @addr: Address to start counting from
- *
- * change_bit() is atomic and may not be reordered.
- * Note that @nr may be almost arbitrarily large; this function is not
- * restricted to acting on a single-word quantity.
- */
-static inline void change_bit(int nr, volatile void * addr)
-{
-       unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
-       unsigned long mask = 1UL << (nr % BITS_PER_LONG);
-       unsigned long tmp;
-
-       asm volatile(
-               "1:     ssrf    5\n"
-               "       ld.w    %0, %2\n"
-               "       eor     %0, %3\n"
-               "       stcond  %1, %0\n"
-               "       brne    1b"
-               : "=&r"(tmp), "=o"(*p)
-               : "m"(*p), "r"(mask)
-               : "cc");
-}
-
-/*
- * test_and_set_bit - Set a bit and return its old value
- * @nr: Bit to set
- * @addr: Address to count from
- *
- * This operation is atomic and cannot be reordered.
- * It also implies a memory barrier.
- */
-static inline int test_and_set_bit(int nr, volatile void * addr)
-{
-       unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
-       unsigned long mask = 1UL << (nr % BITS_PER_LONG);
-       unsigned long tmp, old;
-
-       if (__builtin_constant_p(nr)) {
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %3\n"
-                       "       mov     %2, %0\n"
-                       "       sbr     %0, %4\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p), "=&r"(old)
-                       : "m"(*p), "i"(nr)
-                       : "memory", "cc");
-       } else {
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %2, %3\n"
-                       "       or      %0, %2, %4\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p), "=&r"(old)
-                       : "m"(*p), "r"(mask)
-                       : "memory", "cc");
-       }
-
-       return (old & mask) != 0;
-}
-
-/*
- * test_and_clear_bit - Clear a bit and return its old value
- * @nr: Bit to clear
- * @addr: Address to count from
- *
- * This operation is atomic and cannot be reordered.
- * It also implies a memory barrier.
- */
-static inline int test_and_clear_bit(int nr, volatile void * addr)
-{
-       unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
-       unsigned long mask = 1UL << (nr % BITS_PER_LONG);
-       unsigned long tmp, old;
-
-       if (__builtin_constant_p(nr)) {
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %3\n"
-                       "       mov     %2, %0\n"
-                       "       cbr     %0, %4\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p), "=&r"(old)
-                       : "m"(*p), "i"(nr)
-                       : "memory", "cc");
-       } else {
-               asm volatile(
-                       "1:     ssrf    5\n"
-                       "       ld.w    %0, %3\n"
-                       "       mov     %2, %0\n"
-                       "       andn    %0, %4\n"
-                       "       stcond  %1, %0\n"
-                       "       brne    1b"
-                       : "=&r"(tmp), "=o"(*p), "=&r"(old)
-                       : "m"(*p), "r"(mask)
-                       : "memory", "cc");
-       }
-
-       return (old & mask) != 0;
-}
-
-/*
- * test_and_change_bit - Change a bit and return its old value
- * @nr: Bit to change
- * @addr: Address to count from
- *
- * This operation is atomic and cannot be reordered.
- * It also implies a memory barrier.
- */
-static inline int test_and_change_bit(int nr, volatile void * addr)
-{
-       unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
-       unsigned long mask = 1UL << (nr % BITS_PER_LONG);
-       unsigned long tmp, old;
-
-       asm volatile(
-               "1:     ssrf    5\n"
-               "       ld.w    %2, %3\n"
-               "       eor     %0, %2, %4\n"
-               "       stcond  %1, %0\n"
-               "       brne    1b"
-               : "=&r"(tmp), "=o"(*p), "=&r"(old)
-               : "m"(*p), "r"(mask)
-               : "memory", "cc");
-
-       return (old & mask) != 0;
-}
-
-#include <asm-generic/bitops/non-atomic.h>
-
-/* Find First bit Set */
-static inline unsigned long __ffs(unsigned long word)
-{
-       unsigned long result;
-
-       asm("brev %1\n\t"
-           "clz %0,%1"
-           : "=r"(result), "=&r"(word)
-           : "1"(word));
-       return result;
-}
-
-/* Find First Zero */
-static inline unsigned long ffz(unsigned long word)
-{
-       return __ffs(~word);
-}
-
-/* Find Last bit Set */
-static inline int fls(unsigned long word)
-{
-       unsigned long result;
-
-       asm("clz %0,%1" : "=r"(result) : "r"(word));
-       return 32 - result;
-}
-
-static inline int __fls(unsigned long word)
-{
-       return fls(word) - 1;
-}
-
-unsigned long find_first_zero_bit(const unsigned long *addr,
-                                 unsigned long size);
-#define find_first_zero_bit find_first_zero_bit
-
-unsigned long find_next_zero_bit(const unsigned long *addr,
-                                unsigned long size,
-                                unsigned long offset);
-#define find_next_zero_bit find_next_zero_bit
-
-unsigned long find_first_bit(const unsigned long *addr,
-                            unsigned long size);
-#define find_first_bit find_first_bit
-
-unsigned long find_next_bit(const unsigned long *addr,
-                                unsigned long size,
-                                unsigned long offset);
-#define find_next_bit find_next_bit
-
-/*
- * ffs: find first bit set. This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- *
- * The difference is that bit numbering starts at 1, and if no bit is set,
- * the function returns 0.
- */
-static inline int ffs(unsigned long word)
-{
-       if(word == 0)
-               return 0;
-       return __ffs(word) + 1;
-}
-
-#include <asm-generic/bitops/fls64.h>
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
-
-extern unsigned long find_next_zero_bit_le(const void *addr,
-               unsigned long size, unsigned long offset);
-#define find_next_zero_bit_le find_next_zero_bit_le
-
-extern unsigned long find_next_bit_le(const void *addr,
-               unsigned long size, unsigned long offset);
-#define find_next_bit_le find_next_bit_le
-
-#include <asm-generic/bitops/le.h>
-#include <asm-generic/bitops/ext2-atomic.h>
-
-#endif /* __ASM_AVR32_BITOPS_H */
diff --git a/arch/avr32/include/asm/bug.h b/arch/avr32/include/asm/bug.h
deleted file mode 100644 (file)
index 85a92d0..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_BUG_H
-#define __ASM_AVR32_BUG_H
-
-#ifdef CONFIG_BUG
-
-/*
- * According to our Chief Architect, this compact opcode is very
- * unlikely to ever be implemented.
- */
-#define AVR32_BUG_OPCODE       0x5df0
-
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-
-#define _BUG_OR_WARN(flags)                                            \
-       asm volatile(                                                   \
-               "1:     .hword  %0\n"                                   \
-               "       .section __bug_table,\"a\",@progbits\n"         \
-               "2:     .long   1b\n"                                   \
-               "       .long   %1\n"                                   \
-               "       .short  %2\n"                                   \
-               "       .short  %3\n"                                   \
-               "       .org    2b + %4\n"                              \
-               "       .previous"                                      \
-               :                                                       \
-               : "i"(AVR32_BUG_OPCODE), "i"(__FILE__),                 \
-                 "i"(__LINE__), "i"(flags),                            \
-                 "i"(sizeof(struct bug_entry)))
-
-#else
-
-#define _BUG_OR_WARN(flags)                                            \
-       asm volatile(                                                   \
-               "1:     .hword  %0\n"                                   \
-               "       .section __bug_table,\"a\",@progbits\n"         \
-               "2:     .long   1b\n"                                   \
-               "       .short  %1\n"                                   \
-               "       .org    2b + %2\n"                              \
-               "       .previous"                                      \
-               :                                                       \
-               : "i"(AVR32_BUG_OPCODE), "i"(flags),                    \
-                 "i"(sizeof(struct bug_entry)))
-
-#endif /* CONFIG_DEBUG_BUGVERBOSE */
-
-#define BUG()                                                          \
-       do {                                                            \
-               _BUG_OR_WARN(0);                                        \
-               unreachable();                                          \
-       } while (0)
-
-#define WARN_ON(condition)                                                     \
-       ({                                                              \
-               int __ret_warn_on = !!(condition);                      \
-               if (unlikely(__ret_warn_on))                            \
-                       _BUG_OR_WARN(BUGFLAG_WARNING);                  \
-               unlikely(__ret_warn_on);                                \
-       })
-
-#define HAVE_ARCH_BUG
-#define HAVE_ARCH_WARN_ON
-
-#endif /* CONFIG_BUG */
-
-#include <asm-generic/bug.h>
-
-struct pt_regs;
-void die(const char *str, struct pt_regs *regs, long err);
-void _exception(long signr, struct pt_regs *regs, int code,
-               unsigned long addr);
-
-#endif /* __ASM_AVR32_BUG_H */
diff --git a/arch/avr32/include/asm/bugs.h b/arch/avr32/include/asm/bugs.h
deleted file mode 100644 (file)
index 278661b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *      void check_bugs(void);
- */
-#ifndef __ASM_AVR32_BUGS_H
-#define __ASM_AVR32_BUGS_H
-
-static void __init check_bugs(void)
-{
-       boot_cpu_data.loops_per_jiffy = loops_per_jiffy;
-}
-
-#endif /* __ASM_AVR32_BUGS_H */
diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
deleted file mode 100644 (file)
index c3a58a1..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __ASM_AVR32_CACHE_H
-#define __ASM_AVR32_CACHE_H
-
-#define L1_CACHE_SHIFT 5
-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
-
-/*
- * Memory returned by kmalloc() may be used for DMA, so we must make
- * sure that all such allocations are cache aligned. Otherwise,
- * unrelated code may cause parts of the buffer to be read into the
- * cache before the transfer is done, causing old data to be seen by
- * the CPU.
- */
-#define ARCH_DMA_MINALIGN      L1_CACHE_BYTES
-
-#ifndef __ASSEMBLER__
-struct cache_info {
-       unsigned int ways;
-       unsigned int sets;
-       unsigned int linesz;
-};
-#endif /* __ASSEMBLER */
-
-/* Cache operation constants */
-#define ICACHE_FLUSH           0x00
-#define ICACHE_INVALIDATE      0x01
-#define ICACHE_LOCK            0x02
-#define ICACHE_UNLOCK          0x03
-#define ICACHE_PREFETCH                0x04
-
-#define DCACHE_FLUSH           0x08
-#define DCACHE_LOCK            0x09
-#define DCACHE_UNLOCK          0x0a
-#define DCACHE_INVALIDATE      0x0b
-#define DCACHE_CLEAN           0x0c
-#define DCACHE_CLEAN_INVAL     0x0d
-
-#endif /* __ASM_AVR32_CACHE_H */
diff --git a/arch/avr32/include/asm/cacheflush.h b/arch/avr32/include/asm/cacheflush.h
deleted file mode 100644 (file)
index 96e5382..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_CACHEFLUSH_H
-#define __ASM_AVR32_CACHEFLUSH_H
-
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
-
-#define CACHE_OP_ICACHE_INVALIDATE     0x01
-#define CACHE_OP_DCACHE_INVALIDATE     0x0b
-#define CACHE_OP_DCACHE_CLEAN          0x0c
-#define CACHE_OP_DCACHE_CLEAN_INVAL    0x0d
-
-/*
- * Invalidate any cacheline containing virtual address vaddr without
- * writing anything back to memory.
- *
- * Note that this function may corrupt unrelated data structures when
- * applied on buffers that are not cacheline aligned in both ends.
- */
-static inline void invalidate_dcache_line(void *vaddr)
-{
-       asm volatile("cache %0[0], %1"
-                    :
-                    : "r"(vaddr), "n"(CACHE_OP_DCACHE_INVALIDATE)
-                    : "memory");
-}
-
-/*
- * Make sure any cacheline containing virtual address vaddr is written
- * to memory.
- */
-static inline void clean_dcache_line(void *vaddr)
-{
-       asm volatile("cache %0[0], %1"
-                    :
-                    : "r"(vaddr), "n"(CACHE_OP_DCACHE_CLEAN)
-                    : "memory");
-}
-
-/*
- * Make sure any cacheline containing virtual address vaddr is written
- * to memory and then invalidate it.
- */
-static inline void flush_dcache_line(void *vaddr)
-{
-       asm volatile("cache %0[0], %1"
-                    :
-                    : "r"(vaddr), "n"(CACHE_OP_DCACHE_CLEAN_INVAL)
-                    : "memory");
-}
-
-/*
- * Invalidate any instruction cacheline containing virtual address
- * vaddr.
- */
-static inline void invalidate_icache_line(void *vaddr)
-{
-       asm volatile("cache %0[0], %1"
-                    :
-                    : "r"(vaddr), "n"(CACHE_OP_ICACHE_INVALIDATE)
-                    : "memory");
-}
-
-/*
- * Applies the above functions on all lines that are touched by the
- * specified virtual address range.
- */
-void invalidate_dcache_region(void *start, size_t len);
-void clean_dcache_region(void *start, size_t len);
-void flush_dcache_region(void *start, size_t len);
-void invalidate_icache_region(void *start, size_t len);
-
-/*
- * Make sure any pending writes are completed before continuing.
- */
-#define flush_write_buffer() asm volatile("sync 0" : : : "memory")
-
-/*
- * The following functions are called when a virtual mapping changes.
- * We do not need to flush anything in this case.
- */
-#define flush_cache_all()                      do { } while (0)
-#define flush_cache_mm(mm)                     do { } while (0)
-#define flush_cache_dup_mm(mm)                 do { } while (0)
-#define flush_cache_range(vma, start, end)     do { } while (0)
-#define flush_cache_page(vma, vmaddr, pfn)     do { } while (0)
-#define flush_cache_vmap(start, end)           do { } while (0)
-#define flush_cache_vunmap(start, end)         do { } while (0)
-
-/*
- * I think we need to implement this one to be able to reliably
- * execute pages from RAMDISK. However, if we implement the
- * flush_dcache_*() functions, it might not be needed anymore.
- *
- * #define flush_icache_page(vma, page)                do { } while (0)
- */
-extern void flush_icache_page(struct vm_area_struct *vma, struct page *page);
-
-/*
- * These are (I think) related to D-cache aliasing.  We might need to
- * do something here, but only for certain configurations.  No such
- * configurations exist at this time.
- */
-#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
-#define flush_dcache_page(page)                        do { } while (0)
-#define flush_dcache_mmap_lock(page)           do { } while (0)
-#define flush_dcache_mmap_unlock(page)         do { } while (0)
-
-/*
- * These are for I/D cache coherency. In this case, we do need to
- * flush with all configurations.
- */
-extern void flush_icache_range(unsigned long start, unsigned long end);
-
-extern void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
-               unsigned long vaddr, void *dst, const void *src,
-               unsigned long len);
-
-static inline void copy_from_user_page(struct vm_area_struct *vma,
-               struct page *page, unsigned long vaddr, void *dst,
-               const void *src, unsigned long len)
-{
-       memcpy(dst, src, len);
-}
-
-#endif /* __ASM_AVR32_CACHEFLUSH_H */
diff --git a/arch/avr32/include/asm/checksum.h b/arch/avr32/include/asm/checksum.h
deleted file mode 100644 (file)
index 4ab7d5b..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_CHECKSUM_H
-#define __ASM_AVR32_CHECKSUM_H
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-__wsum csum_partial(const void *buff, int len, __wsum sum);
-
-/*
- * the same as csum_partial, but copies from src while it
- * checksums, and handles user-space pointer exceptions correctly, when needed.
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-__wsum csum_partial_copy_generic(const void *src, void *dst, int len,
-                                      __wsum sum, int *src_err_ptr,
-                                      int *dst_err_ptr);
-
-/*
- *     Note: when you get a NULL pointer exception here this means someone
- *     passed in an incorrect kernel address to one of these functions.
- *
- *     If you use these functions directly please don't forget the
- *     access_ok().
- */
-static inline
-__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                      int len, __wsum sum)
-{
-       return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
-}
-
-static inline
-__wsum csum_partial_copy_from_user(const void __user *src, void *dst,
-                                         int len, __wsum sum, int *err_ptr)
-{
-       return csum_partial_copy_generic((const void __force *)src, dst, len,
-                                        sum, err_ptr, NULL);
-}
-
-/*
- *     This is a version of ip_compute_csum() optimized for IP headers,
- *     which always checksum on 4 octet boundaries.
- */
-static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
-{
-       unsigned int sum, tmp;
-
-       __asm__ __volatile__(
-               "       ld.w    %0, %1++\n"
-               "       ld.w    %3, %1++\n"
-               "       sub     %2, 4\n"
-               "       add     %0, %3\n"
-               "       ld.w    %3, %1++\n"
-               "       adc     %0, %0, %3\n"
-               "       ld.w    %3, %1++\n"
-               "       adc     %0, %0, %3\n"
-               "       acr     %0\n"
-               "1:     ld.w    %3, %1++\n"
-               "       add     %0, %3\n"
-               "       acr     %0\n"
-               "       sub     %2, 1\n"
-               "       brne    1b\n"
-               "       lsl     %3, %0, 16\n"
-               "       andl    %0, 0\n"
-               "       mov     %2, 0xffff\n"
-               "       add     %0, %3\n"
-               "       adc     %0, %0, %2\n"
-               "       com     %0\n"
-               "       lsr     %0, 16\n"
-               : "=r"(sum), "=r"(iph), "=r"(ihl), "=r"(tmp)
-               : "1"(iph), "2"(ihl)
-               : "memory", "cc");
-       return (__force __sum16)sum;
-}
-
-/*
- *     Fold a partial checksum
- */
-
-static inline __sum16 csum_fold(__wsum sum)
-{
-       unsigned int tmp;
-
-       asm("   bfextu  %1, %0, 0, 16\n"
-           "   lsr     %0, 16\n"
-           "   add     %0, %1\n"
-           "   bfextu  %1, %0, 16, 16\n"
-           "   add     %0, %1"
-           : "=&r"(sum), "=&r"(tmp)
-           : "0"(sum));
-
-       return (__force __sum16)~sum;
-}
-
-static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                       __u32 len, __u8 proto,
-                                       __wsum sum)
-{
-       asm("   add     %0, %1\n"
-           "   adc     %0, %0, %2\n"
-           "   adc     %0, %0, %3\n"
-           "   acr     %0"
-           : "=r"(sum)
-           : "r"(daddr), "r"(saddr), "r"(len + proto),
-             "0"(sum)
-           : "cc");
-
-       return sum;
-}
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                       __u32 len, __u8 proto,
-                                       __wsum sum)
-{
-       return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
-}
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-
-static inline __sum16 ip_compute_csum(const void *buff, int len)
-{
-    return csum_fold(csum_partial(buff, len, 0));
-}
-
-#endif /* __ASM_AVR32_CHECKSUM_H */
diff --git a/arch/avr32/include/asm/cmpxchg.h b/arch/avr32/include/asm/cmpxchg.h
deleted file mode 100644 (file)
index 572739b..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc.
- *
- * But use these as seldom as possible since they are slower than
- * regular operations.
- *
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_AVR32_CMPXCHG_H
-#define __ASM_AVR32_CMPXCHG_H
-
-#define xchg(ptr,x) \
-       ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-
-extern void __xchg_called_with_bad_pointer(void);
-
-static inline unsigned long xchg_u32(u32 val, volatile u32 *m)
-{
-       u32 ret;
-
-       asm volatile("xchg %[ret], %[m], %[val]"
-                       : [ret] "=&r"(ret), "=m"(*m)
-                       : "m"(*m), [m] "r"(m), [val] "r"(val)
-                       : "memory");
-       return ret;
-}
-
-static inline unsigned long __xchg(unsigned long x,
-                                      volatile void *ptr,
-                                      int size)
-{
-       switch(size) {
-       case 4:
-               return xchg_u32(x, ptr);
-       default:
-               __xchg_called_with_bad_pointer();
-               return x;
-       }
-}
-
-static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
-                                         unsigned long new)
-{
-       __u32 ret;
-
-       asm volatile(
-               "1:     ssrf    5\n"
-               "       ld.w    %[ret], %[m]\n"
-               "       cp.w    %[ret], %[old]\n"
-               "       brne    2f\n"
-               "       stcond  %[m], %[new]\n"
-               "       brne    1b\n"
-               "2:\n"
-               : [ret] "=&r"(ret), [m] "=m"(*m)
-               : "m"(m), [old] "Ks21r"(old), [new] "r"(new)
-               : "memory", "cc");
-       return ret;
-}
-
-extern unsigned long __cmpxchg_u64_unsupported_on_32bit_kernels(
-        volatile int * m, unsigned long old, unsigned long new);
-#define __cmpxchg_u64 __cmpxchg_u64_unsupported_on_32bit_kernels
-
-/* This function doesn't exist, so you'll get a linker error
-   if something tries to do an invalid cmpxchg().  */
-extern void __cmpxchg_called_with_bad_pointer(void);
-
-static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
-                                     unsigned long new, int size)
-{
-       switch (size) {
-       case 4:
-               return __cmpxchg_u32(ptr, old, new);
-       case 8:
-               return __cmpxchg_u64(ptr, old, new);
-       }
-
-       __cmpxchg_called_with_bad_pointer();
-       return old;
-}
-
-#define cmpxchg(ptr, old, new)                                 \
-       ((typeof(*(ptr)))__cmpxchg((ptr), (unsigned long)(old), \
-                                  (unsigned long)(new),        \
-                                  sizeof(*(ptr))))
-
-#include <asm-generic/cmpxchg-local.h>
-
-static inline unsigned long __cmpxchg_local(volatile void *ptr,
-