Commit 1c51aad8 authored by Samuel Holland's avatar Samuel Holland Committed by Sebastian Reichel
Browse files

power: supply: axp20x_ac_power: Fix reporting online status 



AXP803/AXP813 have a flag that enables/disables the AC power supply
input. This flag does not affect the status bits in PWR_INPUT_STATUS.
Its effect can be verified by checking the battery charge/discharge
state (bit 2 of PWR_INPUT_STATUS), or by examining the current draw on
the AC input.

Take this flag into account when getting the ONLINE property of the AC
input, on PMICs where this flag is present.

Fixes: 7693b564 ("power: supply: add AC power supply driver for AXP813")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 921377c0

drivers/power/supply/axp20x_ac_power.c

+25 −6
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#define AXP20X_PWR_STATUS_ACIN_PRESENT	BIT(7)

#define AXP20X_PWR_STATUS_ACIN_AVAIL	BIT(6)



#define AXP813_ACIN_PATH_SEL		BIT(7)



#define AXP813_VHOLD_MASK		GENMASK(5, 3)

#define AXP813_VHOLD_UV_TO_BIT(x)	((((x) / 100000) - 40) << 3)

#define AXP813_VHOLD_REG_TO_UV(x)	\
@@ -40,6 +42,7 @@ struct axp20x_ac_power { 
	struct power_supply *supply;

	struct iio_channel *acin_v;

	struct iio_channel *acin_i;

	bool has_acin_path_sel;

};



static irqreturn_t axp20x_ac_power_irq(int irq, void *devid)
@@ -86,6 +89,17 @@ static int axp20x_ac_power_get_property(struct power_supply *psy, 
			return ret;



		val->intval = !!(reg & AXP20X_PWR_STATUS_ACIN_AVAIL);



		/* ACIN_PATH_SEL disables ACIN even if ACIN_AVAIL is set. */

		if (val->intval && power->has_acin_path_sel) {

			ret = regmap_read(power->regmap, AXP813_ACIN_PATH_CTRL,

					  &reg);

			if (ret)

				return ret;



			val->intval = !!(reg & AXP813_ACIN_PATH_SEL);

		}



		return 0;



	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
@@ -224,21 +238,25 @@ static const struct power_supply_desc axp813_ac_power_desc = { 
struct axp_data {

	const struct power_supply_desc	*power_desc;

	bool				acin_adc;

	bool				acin_path_sel;

};



static const struct axp_data axp20x_data = {

	.power_desc	= &axp20x_ac_power_desc,

	.acin_adc	= true,

	.acin_path_sel	= false,

};



static const struct axp_data axp22x_data = {

	.power_desc	= &axp22x_ac_power_desc,

	.acin_adc	= false,

	.acin_path_sel	= false,

};



static const struct axp_data axp813_data = {

	.power_desc	= &axp813_ac_power_desc,

	.acin_adc	= false,

	.acin_path_sel	= true,

};



static int axp20x_ac_power_probe(struct platform_device *pdev)
@@ -282,6 +300,7 @@ static int axp20x_ac_power_probe(struct platform_device *pdev) 
	}



	power->regmap = dev_get_regmap(pdev->dev.parent, NULL);

	power->has_acin_path_sel = axp_data->acin_path_sel;



	platform_set_drvdata(pdev, power);

CRA Git | Maintained and supported by SUSTech CRA and CCSE