diff options
| author | Linus Torvalds | 2006-07-05 13:03:18 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2006-07-05 13:03:18 -0700 |
| commit | 887e5d5fcc96e3a7c91e19d9bb419c10196ffdc1 (patch) | |
| tree | 259fac45eddabae544b972c21fae7c031202b910 /drivers | |
| parent | e8f75588dd5885868147b329ced4a5093dc6402e (diff) | |
| parent | ba854e18413d2d827f050984edeb8286c3335895 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3711/1: AT91 timer update
[ARM] 3709/1: pnx4008: convert to generic irq subsystem
[ARM] 3710/1: AT91 Serial: Use GPIO API
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/at91_serial.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c index a7d664383dae..54c6b2adf7b7 100644 --- a/drivers/serial/at91_serial.c +++ b/drivers/serial/at91_serial.c @@ -41,6 +41,7 @@ #include <asm/mach/serial_at91.h> #include <asm/arch/board.h> #include <asm/arch/system.h> +#include <asm/arch/gpio.h> #if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #define SUPPORT_SYSRQ @@ -140,9 +141,9 @@ static void at91_set_mctrl(struct uart_port *port, u_int mctrl) */ if (port->mapbase == AT91_BASE_US0) { if (mctrl & TIOCM_RTS) - at91_sys_write(AT91_PIOA + PIO_CODR, AT91_PA21_RTS0); + at91_set_gpio_value(AT91_PIN_PA21, 0); else - at91_sys_write(AT91_PIOA + PIO_SODR, AT91_PA21_RTS0); + at91_set_gpio_value(AT91_PIN_PA21, 1); } } |