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

Commit 72ebe5a0 authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki
Browse files

ACPI / PMIC: xpower: Add support for the GPI1 regulator to the OpRegion handler 



Some Bay Trail devices use a GPI1 regulator field (address 0x4c) in
their 0x8d power OpRegion, add support for this.

This fixes AE_BAD_PARAMETER errors getting thrown on these devices and
fixes these errors causing these devices to not suspend.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 41f1830f

drivers/acpi/pmic/intel_pmic_xpower.c

+20 −1
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ 
#include "intel_pmic.h"



#define XPOWER_GPADC_LOW	0x5b

#define XPOWER_GPI1_CTRL	0x92



#define GPI1_LDO_MASK		GENMASK(2, 0)

#define GPI1_LDO_ON		(3 << 0)

#define GPI1_LDO_OFF		(4 << 0)



static struct pmic_table power_table[] = {

	{
@@ -118,6 +123,10 @@ static struct pmic_table power_table[] = { 
		.reg = 0x10,

		.bit = 0x00

	}, /* BUC6 */

	{

		.address = 0x4c,

		.reg = 0x92,

	}, /* GPI1 */

};



/* TMP0 - TMP5 are the same, all from GPADC */
@@ -156,7 +165,12 @@ static int intel_xpower_pmic_get_power(struct regmap *regmap, int reg, 
	if (regmap_read(regmap, reg, &data))

		return -EIO;



	/* GPIO1 LDO regulator needs special handling */

	if (reg == XPOWER_GPI1_CTRL)

		*value = ((data & GPI1_LDO_MASK) == GPI1_LDO_ON);

	else

		*value = (data & BIT(bit)) ? 1 : 0;



	return 0;

}
@@ -165,6 +179,11 @@ static int intel_xpower_pmic_update_power(struct regmap *regmap, int reg, 
{

	int data;



	/* GPIO1 LDO regulator needs special handling */

	if (reg == XPOWER_GPI1_CTRL)

		return regmap_update_bits(regmap, reg, GPI1_LDO_MASK,

					  on ? GPI1_LDO_ON : GPI1_LDO_OFF);



	if (regmap_read(regmap, reg, &data))

		return -EIO;