diff options
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 2b784002bf77..5f3035ec0d6f 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -716,15 +716,16 @@ void __init omap_serial_init_port(int port) | |||
| 716 | DEV_CREATE_FILE(dev, &dev_attr_sleep_timeout); | 716 | DEV_CREATE_FILE(dev, &dev_attr_sleep_timeout); |
| 717 | } | 717 | } |
| 718 | 718 | ||
| 719 | /* omap44xx: Never read empty UART fifo | 719 | /* |
| 720 | * omap3xxx: Never read empty UART fifo on UARTs | 720 | * omap44xx: Never read empty UART fifo |
| 721 | * with IP rev >=0x52 | 721 | * omap3xxx: Never read empty UART fifo on UARTs |
| 722 | */ | 722 | * with IP rev >=0x52 |
| 723 | if (cpu_is_omap44xx()) | 723 | */ |
| 724 | uart->p->serial_in = serial_in_override; | 724 | if (cpu_is_omap44xx()) |
| 725 | else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF) | 725 | uart->p->serial_in = serial_in_override; |
| 726 | >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV) | 726 | else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF) |
| 727 | uart->p->serial_in = serial_in_override; | 727 | >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV) |
| 728 | uart->p->serial_in = serial_in_override; | ||
| 728 | } | 729 | } |
| 729 | 730 | ||
| 730 | /** | 731 | /** |