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

Commit 088f1fd2 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Rafael J. Wysocki
Browse files

ACPI / LPSS: fix UART Auto Flow Control 



There is an additional bit in the GENERAL register on newer
silicon that needs to be set or UART's RTS pin fails to
reflect the flow control settings in the Modem Control
Register.

This will fix an issue where the RTS pin of the UART stays
always at 1.8V, regardless of the register settings.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e54968ca

drivers/acpi/acpi_lpss.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ ACPI_MODULE_NAME("acpi_lpss"); 
/* Offsets relative to LPSS_PRIVATE_OFFSET */

/* Offsets relative to LPSS_PRIVATE_OFFSET */

#define LPSS_GENERAL			0x08

#define LPSS_GENERAL			0x08

#define LPSS_GENERAL_LTR_MODE_SW	BIT(2)

#define LPSS_GENERAL_LTR_MODE_SW	BIT(2)

#define LPSS_GENERAL_UART_RTS_OVRD	BIT(3)

#define LPSS_SW_LTR			0x10

#define LPSS_SW_LTR			0x10

#define LPSS_AUTO_LTR			0x14

#define LPSS_AUTO_LTR			0x14

#define LPSS_TX_INT			0x20

#define LPSS_TX_INT			0x20
@@ -68,11 +69,16 @@ struct lpss_private_data { 




static void lpss_uart_setup(struct lpss_private_data *pdata)

static void lpss_uart_setup(struct lpss_private_data *pdata)

{

{

	unsigned int tx_int_offset = pdata->dev_desc->prv_offset + LPSS_TX_INT;

	unsigned int offset;

	u32 reg;

	u32 reg;





	reg = readl(pdata->mmio_base + tx_int_offset);

	offset = pdata->dev_desc->prv_offset + LPSS_TX_INT;

	writel(reg | LPSS_TX_INT_MASK, pdata->mmio_base + tx_int_offset);

	reg = readl(pdata->mmio_base + offset);

	writel(reg | LPSS_TX_INT_MASK, pdata->mmio_base + offset);



	offset = pdata->dev_desc->prv_offset + LPSS_GENERAL;

	reg = readl(pdata->mmio_base + offset);

	writel(reg | LPSS_GENERAL_UART_RTS_OVRD, pdata->mmio_base + offset);

}

}





static struct lpss_device_desc lpt_dev_desc = {

static struct lpss_device_desc lpt_dev_desc = {