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

Commit ea467f9b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "serial: msm_geni_serial: Control RFR manually when RX aborts"

parents 652771c4 fdf483a7

drivers/tty/serial/msm_geni_serial.c

+5 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ static int msm_geni_serial_runtime_resume(struct device *dev); 
static int msm_geni_serial_runtime_suspend(struct device *dev);

static int uart_line_id;

static int msm_geni_serial_get_ver_info(struct uart_port *uport);

static void msm_geni_serial_set_manual_flow(bool enable,

				struct msm_geni_serial_port *port);



#define GET_DEV_PORT(uport) \

	container_of(uport, struct msm_geni_serial_port, uport)
@@ -636,6 +638,7 @@ static void msm_geni_serial_poll_cancel_tx(struct uart_port *uport) 
static void msm_geni_serial_abort_rx(struct uart_port *uport)

{

	unsigned int irq_clear = S_CMD_DONE_EN;

	struct msm_geni_serial_port *port = GET_DEV_PORT(uport);



	geni_abort_s_cmd(uport->membase);

	/* Ensure this goes through before polling. */
@@ -644,6 +647,8 @@ static void msm_geni_serial_abort_rx(struct uart_port *uport) 
	msm_geni_serial_poll_bit(uport, SE_GENI_S_CMD_CTRL_REG,

					S_GENI_CMD_ABORT, false);

	geni_write_reg_nolog(irq_clear, uport->membase, SE_GENI_S_IRQ_CLEAR);

	/* FORCE_DEFAULT makes RFR default high, hence set manually Low */

	msm_geni_serial_set_manual_flow(true, port);

	geni_write_reg(FORCE_DEFAULT, uport->membase, GENI_FORCE_DEFAULT_REG);

}