aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/atmel_serial.c
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2006-10-04 10:02:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 13:25:06 -0400
commitacca9b83acfe89fbb7421d5412176dee2ad2959a (patch)
tree662434e93a8b67e2074d292a9cf68995982daf9c /drivers/serial/atmel_serial.c
parent75d35213777e2b278db57a420efbce2bdb61da93 (diff)
[PATCH] atmel_serial: Support AVR32
Make CONFIG_SERIAL_ATMEL selectable on AVR32 and #ifdef out some ARM- specific code in the driver. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/serial/atmel_serial.c')
-rw-r--r--drivers/serial/atmel_serial.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 34212df39800..61db2166fbb5 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -39,8 +39,10 @@
39#include <asm/arch/at91rm9200_pdc.h> 39#include <asm/arch/at91rm9200_pdc.h>
40#include <asm/mach/serial_at91.h> 40#include <asm/mach/serial_at91.h>
41#include <asm/arch/board.h> 41#include <asm/arch/board.h>
42#ifdef CONFIG_ARM
42#include <asm/arch/system.h> 43#include <asm/arch/system.h>
43#include <asm/arch/gpio.h> 44#include <asm/arch/gpio.h>
45#endif
44 46
45#include "atmel_serial.h" 47#include "atmel_serial.h"
46 48
@@ -135,6 +137,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl)
135 unsigned int control = 0; 137 unsigned int control = 0;
136 unsigned int mode; 138 unsigned int mode;
137 139
140#ifdef CONFIG_ARM
138 if (arch_identify() == ARCH_ID_AT91RM9200) { 141 if (arch_identify() == ARCH_ID_AT91RM9200) {
139 /* 142 /*
140 * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21. 143 * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21.
@@ -147,6 +150,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl)
147 at91_set_gpio_value(AT91_PIN_PA21, 1); 150 at91_set_gpio_value(AT91_PIN_PA21, 1);
148 } 151 }
149 } 152 }
153#endif
150 154
151 if (mctrl & TIOCM_RTS) 155 if (mctrl & TIOCM_RTS)
152 control |= ATMEL_US_RTSEN; 156 control |= ATMEL_US_RTSEN;