Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e50254a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "uart: pl011: Improve LCRH register access decision" 



This reverts commit 09dcc7df as with
this patch the serial console is broken on lots of platforms.

Reported-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Jun Nie <jun.nie@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 062a68a5

drivers/tty/serial/amba-pl011.c

+2 −7
Original line number Diff line number Diff line
@@ -249,11 +249,6 @@ struct uart_amba_port { 
#endif

};



static bool is_implemented(struct uart_amba_port *uap, unsigned int reg)

{

	return uap->reg_lut[reg] != (u16)~0;

}



static unsigned int pl011_readw(struct uart_amba_port *uap, int index)

{

	WARN_ON(index > REG_NR);
@@ -1654,7 +1649,7 @@ static int pl011_hwinit(struct uart_port *port) 
static void pl011_write_lcr_h(struct uart_amba_port *uap, unsigned int lcr_h)

{

	pl011_writew(uap, lcr_h, uap->lcrh_rx);

	if (is_implemented(uap, REG_ST_LCRH_RX)) {

	if (uap->lcrh_rx != uap->lcrh_tx) {

		int i;

		/*

		 * Wait 10 PCLKs before writing LCRH_TX register,
@@ -1789,7 +1784,7 @@ static void pl011_disable_uart(struct uart_amba_port *uap) 
	 * disable break condition and fifos

	 */

	pl011_shutdown_channel(uap, uap->lcrh_rx);

	if (is_implemented(uap, REG_ST_LCRH_RX))

	if (uap->lcrh_rx != uap->lcrh_tx)

		pl011_shutdown_channel(uap, uap->lcrh_tx);

}