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

3 files changed, 9 insertions, 9 deletions

diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 1f33a106905c..2adc261c9e3d 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -252,12 +252,12 @@ static void __init atstk1002_setup_extdac(void)
 void __init setup_board(void)
 {
 #ifdef  CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-        at32_map_usart(0, 1);   /* USART 0/B: /dev/ttyS1, IRDA */
+        at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
 #else
-        at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
+        at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
 #endif
         /* USART 2/unused: expansion connector */
-        at32_map_usart(3, 2);   /* USART 3/C: /dev/ttyS2, DB9 */
+        at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
 
         at32_setup_serial_console(0);
 }
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index b3a23c88bcfe..ff7e23298827 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -115,12 +115,12 @@ static void __init atstk1003_setup_extdac(void)
 void __init setup_board(void)
 {
 #ifdef  CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-        at32_map_usart(0, 1);   /* USART 0/B: /dev/ttyS1, IRDA */
+        at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
 #else
-        at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
+        at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
 #endif
         /* USART 2/unused: expansion connector */
-        at32_map_usart(3, 2);   /* USART 3/C: /dev/ttyS2, DB9 */
+        at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
 
         at32_setup_serial_console(0);
 }
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index 29b35aca96cd..69a9f0f08c6e 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -120,12 +120,12 @@ static void __init atstk1004_setup_extdac(void)
 void __init setup_board(void)
 {
 #ifdef  CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
-        at32_map_usart(0, 1);   /* USART 0/B: /dev/ttyS1, IRDA */
+        at32_map_usart(0, 1, 0);        /* USART 0/B: /dev/ttyS1, IRDA */
 #else
-        at32_map_usart(1, 0);   /* USART 1/A: /dev/ttyS0, DB9 */
+        at32_map_usart(1, 0, 0);        /* USART 1/A: /dev/ttyS0, DB9 */
 #endif
         /* USART 2/unused: expansion connector */
-        at32_map_usart(3, 2);   /* USART 3/C: /dev/ttyS2, DB9 */
+        at32_map_usart(3, 2, 0);        /* USART 3/C: /dev/ttyS2, DB9 */
 
         at32_setup_serial_console(0);
 }