diff options
| author |   Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-10-04 16:02:09 +0200 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:25:06 -0700 |
| commit | acca9b83acfe89fbb7421d5412176dee2ad2959a (patch) | |
| tree | 662434e93a8b67e2074d292a9cf68995982daf9c /drivers/serial/atmel_serial.c | |
| parent | [PATCH] atmel_serial: Pass fixed register mappings through platform_data (diff) | |
| download | linux-dev-acca9b83acfe89fbb7421d5412176dee2ad2959a.tar.xz linux-dev-acca9b83acfe89fbb7421d5412176dee2ad2959a.zip | |
[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.c | 4 |
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 @@ #include <asm/arch/at91rm9200_pdc.h> #include <asm/mach/serial_at91.h> #include <asm/arch/board.h> +#ifdef CONFIG_ARM #include <asm/arch/system.h> #include <asm/arch/gpio.h> +#endif #include "atmel_serial.h" @@ -135,6 +137,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) unsigned int control = 0; unsigned int mode; +#ifdef CONFIG_ARM if (arch_identify() == ARCH_ID_AT91RM9200) { /* * 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) at91_set_gpio_value(AT91_PIN_PA21, 1); } } +#endif if (mctrl & TIOCM_RTS) control |= ATMEL_US_RTSEN; |