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

Commit 528e3504 authored by Wenyou Yang's avatar Wenyou Yang Committed by Sebastian Reichel
Browse files

power: supply: act8945a_charger: Add max current property 



Add the power supply's current max property,
POWER_SUPPLY_PROP_CURRENT_MAX.

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

drivers/power/supply/act8945a_charger.c

+80 −9
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/power_supply.h>

#include <linux/power_supply.h>
@@ -85,6 +84,7 @@ struct act8945a_charger { 




	bool init_done;

	bool init_done;

	struct gpio_desc *lbo_gpio;

	struct gpio_desc *lbo_gpio;

	struct gpio_desc *chglev_gpio;

};

};





static int act8945a_get_charger_state(struct regmap *regmap, int *val)

static int act8945a_get_charger_state(struct regmap *regmap, int *val)
@@ -265,12 +265,80 @@ static int act8945a_get_capacity_level(struct act8945a_charger *charger, 
	return 0;

	return 0;

}

}





#define MAX_CURRENT_USB_HIGH	450000

#define MAX_CURRENT_USB_LOW	90000

#define MAX_CURRENT_USB_PRE	45000

/*

 * Riset(K) = 2336 * (1V/Ichg(mA)) - 0.205

 * Riset = 2.43K

 */

#define MAX_CURRENT_AC_HIGH		886527

#define MAX_CURRENT_AC_LOW		117305

#define MAX_CURRENT_AC_HIGH_PRE		88653

#define MAX_CURRENT_AC_LOW_PRE		11731



static int act8945a_get_current_max(struct act8945a_charger *charger,

				    struct regmap *regmap, int *val)

{

	int ret;

	unsigned int status, state;

	unsigned int acin_state;

	int chgin_level = gpiod_get_value(charger->chglev_gpio);



	ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);

	if (ret < 0)

		return ret;



	ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);

	if (ret < 0)

		return ret;



	acin_state = (state & APCH_STATE_ACINSTAT) >> 1;



	state &= APCH_STATE_CSTATE;

	state >>= APCH_STATE_CSTATE_SHIFT;



	switch (state) {

	case APCH_STATE_CSTATE_PRE:

		if (acin_state) {

			if (chgin_level)

				*val = MAX_CURRENT_AC_HIGH_PRE;

			else

				*val = MAX_CURRENT_AC_LOW_PRE;

		} else {

			*val = MAX_CURRENT_USB_PRE;

		}

		break;

	case APCH_STATE_CSTATE_FAST:

		if (acin_state) {

			if (chgin_level)

				*val = MAX_CURRENT_AC_HIGH;

			else

				*val = MAX_CURRENT_AC_LOW;

		} else {

			if (chgin_level)

				*val = MAX_CURRENT_USB_HIGH;

			else

				*val = MAX_CURRENT_USB_LOW;

		}

		break;

	case APCH_STATE_CSTATE_EOC:

	case APCH_STATE_CSTATE_DISABLED:

	default:

		*val = 0;

		break;

	}



	return 0;

}



static enum power_supply_property act8945a_charger_props[] = {

static enum power_supply_property act8945a_charger_props[] = {

	POWER_SUPPLY_PROP_STATUS,

	POWER_SUPPLY_PROP_STATUS,

	POWER_SUPPLY_PROP_CHARGE_TYPE,

	POWER_SUPPLY_PROP_CHARGE_TYPE,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_HEALTH,

	POWER_SUPPLY_PROP_HEALTH,

	POWER_SUPPLY_PROP_CAPACITY_LEVEL,

	POWER_SUPPLY_PROP_CAPACITY_LEVEL,

	POWER_SUPPLY_PROP_CURRENT_MAX,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MANUFACTURER

	POWER_SUPPLY_PROP_MANUFACTURER

};

};
@@ -300,6 +368,10 @@ static int act8945a_charger_get_property(struct power_supply *psy, 
		ret = act8945a_get_capacity_level(charger,

		ret = act8945a_get_capacity_level(charger,

						  regmap, &val->intval);

						  regmap, &val->intval);

		break;

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		ret = act8945a_get_current_max(charger,

					       regmap, &val->intval);

		break;

	case POWER_SUPPLY_PROP_MODEL_NAME:

	case POWER_SUPPLY_PROP_MODEL_NAME:

		val->strval = act8945a_charger_model;

		val->strval = act8945a_charger_model;

		break;

		break;
@@ -390,13 +462,11 @@ static int act8945a_charger_config(struct device *dev, 
				   struct act8945a_charger *charger)

				   struct act8945a_charger *charger)

{

{

	struct device_node *np = dev->of_node;

	struct device_node *np = dev->of_node;

	enum of_gpio_flags flags;

	struct regmap *regmap = charger->regmap;

	struct regmap *regmap = charger->regmap;





	u32 total_time_out;

	u32 total_time_out;

	u32 pre_time_out;

	u32 pre_time_out;

	u32 input_voltage_threshold;

	u32 input_voltage_threshold;

	int chglev_pin;

	int err, ret;

	int err, ret;





	unsigned int tmp;

	unsigned int tmp;
@@ -431,12 +501,13 @@ static int act8945a_charger_config(struct device *dev, 
	if (ret)

	if (ret)

		dev_info(dev, "failed to request gpio \"lbo\" IRQ\n");

		dev_info(dev, "failed to request gpio \"lbo\" IRQ\n");





	chglev_pin = of_get_named_gpio_flags(np,

	charger->chglev_gpio = devm_gpiod_get_optional(dev,

				"active-semi,chglev-gpios", 0, &flags);

						       "active-semi,chglev",



						       GPIOD_IN);

	if (gpio_is_valid(chglev_pin)) {

	if (IS_ERR(charger->chglev_gpio)) {

		gpio_set_value(chglev_pin,

		err = PTR_ERR(charger->chglev_gpio);

			       ((flags == OF_GPIO_ACTIVE_LOW) ? 0 : 1));

		dev_err(dev, "unable to claim gpio \"chglev\": %d\n", err);

		return err;

	}

	}





	if (of_property_read_u32(np,

	if (of_property_read_u32(np,