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

Commit cecbf8d5 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: axp20x_usb: Add support for usb power-supply on axp22x pmics 



The usb power-supply on the axp22x pmics is mostly identical to the
one on the axp20x pmics. One significant difference is that it cannot
measure / monitor the usb voltage / current.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 5630b433

Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt

+2 −1
Original line number Diff line number Diff line 
AXP20x USB power supply



Required Properties:

-compatible: "x-powers,axp202-usb-power-supply"

-compatible: One of: "x-powers,axp202-usb-power-supply"

                     "x-powers,axp221-usb-power-supply"



This node is a subnode of the axp20x PMIC.

drivers/power/axp20x_usb_power.c

+69 −23
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#define AXP20X_VBUS_MON_VBUS_VALID	BIT(3)



struct axp20x_usb_power {

	struct device_node *np;

	struct regmap *regmap;

	struct power_supply *supply;

};
@@ -85,7 +86,12 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, 


		switch (v & AXP20X_VBUS_CLIMIT_MASK) {

		case AXP20X_VBUC_CLIMIT_100mA:

			if (of_device_is_compatible(power->np,

					"x-powers,axp202-usb-power-supply")) {

				val->intval = 100000;

			} else {

				val->intval = -1; /* No 100mA limit */

			}

			break;

		case AXP20X_VBUC_CLIMIT_500mA:

			val->intval = 500000;
@@ -122,16 +128,19 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, 
			break;

		}



		ret = regmap_read(power->regmap, AXP20X_USB_OTG_STATUS, &v);

		val->intval = POWER_SUPPLY_HEALTH_GOOD;



		if (of_device_is_compatible(power->np,

				"x-powers,axp202-usb-power-supply")) {

			ret = regmap_read(power->regmap,

					  AXP20X_USB_OTG_STATUS, &v);

			if (ret)

				return ret;



		if (!(v & AXP20X_USB_STATUS_VBUS_VALID)) {

			val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;

			break;

			if (!(v & AXP20X_USB_STATUS_VBUS_VALID))

				val->intval =

					POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;

		}



		val->intval = POWER_SUPPLY_HEALTH_GOOD;

		break;

	case POWER_SUPPLY_PROP_PRESENT:

		val->intval = !!(input & AXP20X_PWR_STATUS_VBUS_PRESENT);
@@ -156,6 +165,14 @@ static enum power_supply_property axp20x_usb_power_properties[] = { 
	POWER_SUPPLY_PROP_CURRENT_NOW,

};



static enum power_supply_property axp22x_usb_power_properties[] = {

	POWER_SUPPLY_PROP_HEALTH,

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_VOLTAGE_MIN,

	POWER_SUPPLY_PROP_CURRENT_MAX,

};



static const struct power_supply_desc axp20x_usb_power_desc = {

	.name = "axp20x-usb",

	.type = POWER_SUPPLY_TYPE_USB,
@@ -164,13 +181,25 @@ static const struct power_supply_desc axp20x_usb_power_desc = { 
	.get_property = axp20x_usb_power_get_property,

};



static const struct power_supply_desc axp22x_usb_power_desc = {

	.name = "axp20x-usb",

	.type = POWER_SUPPLY_TYPE_USB,

	.properties = axp22x_usb_power_properties,

	.num_properties = ARRAY_SIZE(axp22x_usb_power_properties),

	.get_property = axp20x_usb_power_get_property,

};



static int axp20x_usb_power_probe(struct platform_device *pdev)

{

	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);

	struct power_supply_config psy_cfg = {};

	struct axp20x_usb_power *power;

	static const char * const irq_names[] = { "VBUS_PLUGIN",

		"VBUS_REMOVAL", "VBUS_VALID", "VBUS_NOT_VALID" };

	static const char * const axp20x_irq_names[] = { "VBUS_PLUGIN",

		"VBUS_REMOVAL", "VBUS_VALID", "VBUS_NOT_VALID", NULL };

	static const char * const axp22x_irq_names[] = {

		"VBUS_PLUGIN", "VBUS_REMOVAL", NULL };

	static const char * const *irq_names;

	const struct power_supply_desc *usb_power_desc;

	int i, irq, ret;



	if (!of_device_is_available(pdev->dev.of_node))
@@ -185,11 +214,15 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) 
	if (!power)

		return -ENOMEM;



	power->np = pdev->dev.of_node;

	power->regmap = axp20x->regmap;



	if (of_device_is_compatible(power->np,

			"x-powers,axp202-usb-power-supply")) {

		/* Enable vbus valid checking */

		ret = regmap_update_bits(power->regmap, AXP20X_VBUS_MON,

		    AXP20X_VBUS_MON_VBUS_VALID, AXP20X_VBUS_MON_VBUS_VALID);

					 AXP20X_VBUS_MON_VBUS_VALID,

					 AXP20X_VBUS_MON_VBUS_VALID);

		if (ret)

			return ret;
@@ -200,16 +233,28 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) 
		if (ret)

			return ret;



		usb_power_desc = &axp20x_usb_power_desc;

		irq_names = axp20x_irq_names;

	} else if (of_device_is_compatible(power->np,

			"x-powers,axp221-usb-power-supply")) {

		usb_power_desc = &axp22x_usb_power_desc;

		irq_names = axp22x_irq_names;

	} else {

		dev_err(&pdev->dev, "Unsupported AXP variant: %ld\n",

			axp20x->variant);

		return -EINVAL;

	}



	psy_cfg.of_node = pdev->dev.of_node;

	psy_cfg.drv_data = power;



	power->supply = devm_power_supply_register(&pdev->dev,

					&axp20x_usb_power_desc, &psy_cfg);

	power->supply = devm_power_supply_register(&pdev->dev, usb_power_desc,

						   &psy_cfg);

	if (IS_ERR(power->supply))

		return PTR_ERR(power->supply);



	/* Request irqs after registering, as irqs may trigger immediately */

	for (i = 0; i < ARRAY_SIZE(irq_names); i++) {

	for (i = 0; irq_names[i]; i++) {

		irq = platform_get_irq_byname(pdev, irq_names[i]);

		if (irq < 0) {

			dev_warn(&pdev->dev, "No IRQ for %s: %d\n",
@@ -229,6 +274,7 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) 


static const struct of_device_id axp20x_usb_power_match[] = {

	{ .compatible = "x-powers,axp202-usb-power-supply" },

	{ .compatible = "x-powers,axp221-usb-power-supply" },

	{ }

};

MODULE_DEVICE_TABLE(of, axp20x_usb_power_match);