Commit 765bdd4e authored by Mika Westerberg's avatar Mika Westerberg Committed by Rafael J. Wysocki
Browse files

ACPI / LPSS: Take I2C host controllers out of reset 



On Intel Baytrail, some I2C host controllers are held in reset when the OS
gets control. This causes the driver to fail to detect the hardware
properly.

Fix this so that we make sure that the I2C host controller is not in reset
when the driver gets probe'd.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7171511e

drivers/acpi/acpi_lpss.c

+15 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ ACPI_MODULE_NAME("acpi_lpss"); 


/* Offsets relative to LPSS_PRIVATE_OFFSET */

#define LPSS_CLK_DIVIDER_DEF_MASK	(BIT(1) | BIT(16))

#define LPSS_RESETS			0x04

#define LPSS_RESETS_RESET_FUNC		BIT(0)

#define LPSS_RESETS_RESET_APB		BIT(1)

#define LPSS_GENERAL			0x08

#define LPSS_GENERAL_LTR_MODE_SW	BIT(2)

#define LPSS_GENERAL_UART_RTS_OVRD	BIT(3)
@@ -99,6 +102,17 @@ static void lpss_uart_setup(struct lpss_private_data *pdata) 
	writel(reg | LPSS_GENERAL_UART_RTS_OVRD, pdata->mmio_base + offset);

}



static void lpss_i2c_setup(struct lpss_private_data *pdata)

{

	unsigned int offset;

	u32 val;



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

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

	val |= LPSS_RESETS_RESET_APB | LPSS_RESETS_RESET_FUNC;

	writel(val, pdata->mmio_base + offset);

}



static struct lpss_device_desc lpt_dev_desc = {

	.clk_required = true,

	.prv_offset = 0x800,
@@ -171,6 +185,7 @@ static struct lpss_device_desc byt_i2c_dev_desc = { 
	.prv_offset = 0x800,

	.save_ctx = true,

	.shared_clock = &i2c_clock,

	.setup = lpss_i2c_setup,

};



#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE