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

Commit 10ca08b0 authored by Wenyou Yang's avatar Wenyou Yang Committed by Sebastian Reichel
Browse files

power: supply: act8945a_charger: Fix the power supply type 



The power supply type property is varying as the external power
supply changes. It is not a constant.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent a09209ac

drivers/power/supply/act8945a_charger.c

+39 −9
Original line number Original line Diff line number Diff line
@@ -78,6 +78,7 @@ static const char *act8945a_charger_manufacturer = "Active-semi"; 




struct act8945a_charger {

struct act8945a_charger {

	struct power_supply *psy;

	struct power_supply *psy;

	struct power_supply_desc desc;

	struct regmap *regmap;

	struct regmap *regmap;

	struct work_struct work;

	struct work_struct work;
@@ -250,14 +251,6 @@ static int act8945a_charger_get_property(struct power_supply *psy, 
	return ret;

	return ret;

}

}





static const struct power_supply_desc act8945a_charger_desc = {

	.name		= "act8945a-charger",

	.type		= POWER_SUPPLY_TYPE_BATTERY,

	.get_property	= act8945a_charger_get_property,

	.properties	= act8945a_charger_props,

	.num_properties	= ARRAY_SIZE(act8945a_charger_props),

};



static int act8945a_enable_interrupt(struct act8945a_charger *charger)

static int act8945a_enable_interrupt(struct act8945a_charger *charger)

{

{

	struct regmap *regmap = charger->regmap;

	struct regmap *regmap = charger->regmap;
@@ -281,11 +274,39 @@ static int act8945a_enable_interrupt(struct act8945a_charger *charger) 
	return 0;

	return 0;

}

}





static unsigned int act8945a_set_supply_type(struct act8945a_charger *charger,

					     unsigned int *type)

{

	unsigned int status, state;

	int ret;



	ret = regmap_read(charger->regmap, ACT8945A_APCH_STATUS, &status);

	if (ret < 0)

		return ret;



	ret = regmap_read(charger->regmap, ACT8945A_APCH_STATE, &state);

	if (ret < 0)

		return ret;



	if (status & APCH_STATUS_INDAT) {

		if (state & APCH_STATE_ACINSTAT)

			*type = POWER_SUPPLY_TYPE_MAINS;

		else

			*type = POWER_SUPPLY_TYPE_USB;

	} else {

		*type = POWER_SUPPLY_TYPE_BATTERY;

	}



	return 0;

}



static void act8945a_work(struct work_struct *work)

static void act8945a_work(struct work_struct *work)

{

{

	struct act8945a_charger *charger =

	struct act8945a_charger *charger =

			container_of(work, struct act8945a_charger, work);

			container_of(work, struct act8945a_charger, work);





	act8945a_set_supply_type(charger, &charger->desc.type);



	power_supply_changed(charger->psy);

	power_supply_changed(charger->psy);

}

}
@@ -440,11 +461,20 @@ static int act8945a_charger_probe(struct platform_device *pdev) 
		return ret;

		return ret;

	}

	}





	charger->desc.name = "act8945a-charger";

	charger->desc.get_property = act8945a_charger_get_property;

	charger->desc.properties = act8945a_charger_props;

	charger->desc.num_properties = ARRAY_SIZE(act8945a_charger_props);



	ret = act8945a_set_supply_type(charger, &charger->desc.type);

	if (ret)

		return -EINVAL;



	psy_cfg.of_node	= pdev->dev.of_node;

	psy_cfg.of_node	= pdev->dev.of_node;

	psy_cfg.drv_data = charger;

	psy_cfg.drv_data = charger;





	charger->psy = devm_power_supply_register(&pdev->dev,

	charger->psy = devm_power_supply_register(&pdev->dev,

						  &act8945a_charger_desc,

						  &charger->desc,

						  &psy_cfg);

						  &psy_cfg);

	if (IS_ERR(charger->psy)) {

	if (IS_ERR(charger->psy)) {

		dev_err(&pdev->dev, "failed to register power supply\n");

		dev_err(&pdev->dev, "failed to register power supply\n");