Merge "serial: msm_geni_serial: Do not unvote UFFI voted clocks for console" (30a97779) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/tty/serial/msm_geni_serial.c

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -174,6 +174,7 @@ struct msm_geni_serial_port {
	struct msm_geni_serial_ver_info ver_info;		struct msm_geni_serial_ver_info ver_info;
	u32 cur_tx_remaining;		u32 cur_tx_remaining;
	bool startup_in_progress;		bool startup_in_progress;
			bool is_console;
	};		};

	static const struct uart_ops msm_geni_serial_pops;		static const struct uart_ops msm_geni_serial_pops;
	@@ -2554,6 +2555,12 @@ static int msm_geni_serial_get_ver_info(struct uart_port *uport)
	int hw_ver, ret = 0;		int hw_ver, ret = 0;
	struct msm_geni_serial_port *msm_port = GET_DEV_PORT(uport);		struct msm_geni_serial_port *msm_port = GET_DEV_PORT(uport);

			/*
			* At this time early console is still active and transfers are
			* in-coming. Make sure UART doesn't turn on/off clocks for
			* console usecase.
			*/
			if (!msm_port->is_console)
	se_geni_clks_on(&msm_port->serial_rsc);		se_geni_clks_on(&msm_port->serial_rsc);
	/* Basic HW and FW info */		/* Basic HW and FW info */
	if (unlikely(get_se_proto(uport->membase) != UART)) {		if (unlikely(get_se_proto(uport->membase) != UART)) {
	@@ -2582,6 +2589,7 @@ static int msm_geni_serial_get_ver_info(struct uart_port *uport)
	msm_port->ver_info.hw_minor_ver,		msm_port->ver_info.hw_minor_ver,
	msm_port->ver_info.hw_step_ver);		msm_port->ver_info.hw_step_ver);
	exit_ver_info:		exit_ver_info:
			if (!msm_port->is_console)
	se_geni_clks_off(&msm_port->serial_rsc);		se_geni_clks_off(&msm_port->serial_rsc);
	return ret;		return ret;
	}		}
	@@ -2634,6 +2642,7 @@ static int msm_geni_serial_probe(struct platform_device *pdev)
	line, ret);		line, ret);
	goto exit_geni_serial_probe;		goto exit_geni_serial_probe;
	}		}
			dev_port->is_console = is_console;

	uport = &dev_port->uport;		uport = &dev_port->uport;