diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:57:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:02:14 -0400 |
| commit | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (patch) | |
| tree | 6c3c4a2110d0ff3d73c4bacaddb23b9295663695 /drivers/tty/serial/xilinx_uartps.c | |
| parent | 9bc128e16bb82c046d6972171de572affc5c4cbf (diff) | |
| parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
Merge branch 'mxs/cleanup' into next/multiplatform
This is a dependency for mxs/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
Diffstat (limited to 'drivers/tty/serial/xilinx_uartps.c')
| -rw-r--r-- | drivers/tty/serial/xilinx_uartps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index ba451c7209fc..f36bbba1ac8b 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c | |||
| @@ -578,6 +578,8 @@ static int xuartps_startup(struct uart_port *port) | |||
| 578 | /* Receive Timeout register is enabled with value of 10 */ | 578 | /* Receive Timeout register is enabled with value of 10 */ |
| 579 | xuartps_writel(10, XUARTPS_RXTOUT_OFFSET); | 579 | xuartps_writel(10, XUARTPS_RXTOUT_OFFSET); |
| 580 | 580 | ||
| 581 | /* Clear out any pending interrupts before enabling them */ | ||
| 582 | xuartps_writel(xuartps_readl(XUARTPS_ISR_OFFSET), XUARTPS_ISR_OFFSET); | ||
| 581 | 583 | ||
| 582 | /* Set the Interrupt Registers with desired interrupts */ | 584 | /* Set the Interrupt Registers with desired interrupts */ |
| 583 | xuartps_writel(XUARTPS_IXR_TXEMPTY | XUARTPS_IXR_PARITY | | 585 | xuartps_writel(XUARTPS_IXR_TXEMPTY | XUARTPS_IXR_PARITY | |