Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

* 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: add hardware handshake support to atmel_serial
  avr32: add RTS/CTS/CLK pin selection for the USARTs
  Add RTC support for Merisc boards
  avr32: at32ap700x: setup DMA for AC97C in the machine code
  avr32: at32ap700x: setup DMA for ABDAC in the machine code
  Add Merisc board support
  avr32: use gpio_is_valid() to check USBA vbus_pin I/O line
  atmel-usba-udc: use gpio_is_valid() to check vbus_pin I/O line
  avr32: fix timing LCD parameters for EVKLCD10X boards
  avr32: use GPIO line PB15 on EVKLCD10x boards for backlight
  avr32: configure MCI detect and write protect pins for EVKLCD10x boards
  avr32: set pin mask to alternative 18 bpp for EVKLCD10x boards
  avr32: add pin mask for 18-bit color on the LCD controller
  avr32: fix 15-bit LCDC pin mask to use MSB lines

1 files changed, 14 insertions, 0 deletions

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 414a8ad97f5..35e3bd9858d 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -144,6 +144,19 @@ 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
@@ -153,6 +166,7 @@ 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"