serial/amba-pl011: Fix mismerge between v4.1-rc4 and tty-next