tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/home/rmk/linux-2.6-serial

Linus Torvalds 25bf368b 0825c5d0

-14
unified split
-14
drivers/serial/ioc4_serial.c
··· 1717 } 1718 1719 if (cflag & CRTSCTS) { 1720 - info->flags |= ASYNC_CTS_FLOW; 1721 port->ip_sscr |= IOC4_SSCR_HFC_EN; 1722 } 1723 else { 1724 - info->flags &= ~ASYNC_CTS_FLOW; 1725 port->ip_sscr &= ~IOC4_SSCR_HFC_EN; 1726 } 1727 writel(port->ip_sscr, &port->ip_serial_regs->sscr); ··· 1758 1759 info = the_port->info; 1760 1761 - if (info->tty) { 1762 - set_bit(TTY_IO_ERROR, &info->tty->flags); 1763 - clear_bit(TTY_IO_ERROR, &info->tty->flags); 1764 - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) 1765 - info->tty->alt_speed = 57600; 1766 - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI) 1767 - info->tty->alt_speed = 115200; 1768 - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI) 1769 - info->tty->alt_speed = 230400; 1770 - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) 1771 - info->tty->alt_speed = 460800; 1772 - } 1773 local_open(port); 1774 1775 /* set the speed of the serial port */
··· 1717 } 1718 1719 if (cflag & CRTSCTS) { 1720 port->ip_sscr |= IOC4_SSCR_HFC_EN; 1721 } 1722 else { 1723 port->ip_sscr &= ~IOC4_SSCR_HFC_EN; 1724 } 1725 writel(port->ip_sscr, &port->ip_serial_regs->sscr); ··· 1760 1761 info = the_port->info; 1762 1763 local_open(port); 1764 1765 /* set the speed of the serial port */