diff mbox series

[v4,05/10] power: supply: max77693: Add USB extcon detection for enabling charging

Message ID 20240816-max77693-charger-extcon-v4-5-050a0a9bfea0@gmail.com (mailing list archive)
State New
Headers show
Series power: supply: max77693: Toggle charging/OTG based on extcon status | expand

Commit Message

Artur Weber Aug. 16, 2024, 8:19 a.m. UTC
1. Add a function that allows for enabling/disabling charging.

2. Add a device tree property, "maxim,usb-connector", that can be used to
specify a USB connector to use to detect whether a charging cable has
been plugged in/out, and enable/disable charging accordingly.

The extcon listener/worker implementation is inspired by the rt5033_charger
driver.

Tested-by: Henrik Grimler <henrik@grimler.se>
Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
---
Changes in v4:
- Fix missing connector property causing probe deferrals

Changes in v3:
- Adapted to both limits being split up again
- Move charging/extcon work functions above reg_init
- Drop unnecessary extcon unregister from probe error path
- Change disconnect message

Changes in v2:
- Changed to adapt to both current limits being managed by one function
---
 drivers/power/supply/Kconfig            |   1 +
 drivers/power/supply/max77693_charger.c | 122 ++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+)

Comments

Krzysztof Kozlowski Aug. 16, 2024, 10 a.m. UTC | #1
On 16/08/2024 10:19, Artur Weber wrote:
> 1. Add a function that allows for enabling/disabling charging.
> 
> 2. Add a device tree property, "maxim,usb-connector", that can be used to
> specify a USB connector to use to detect whether a charging cable has
> been plugged in/out, and enable/disable charging accordingly.
> 
> The extcon listener/worker implementation is inspired by the rt5033_charger
> driver.
> 
> Tested-by: Henrik Grimler <henrik@grimler.se>
> Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
> ---
> Changes in v4:
> - Fix missing connector property causing probe deferrals
> 

Thank you for your patch. There is something to discuss/improve.


> +static void max77693_charger_extcon_work(struct work_struct *work)
> +{
> +	struct max77693_charger *chg = container_of(work, struct max77693_charger,
> +						  cable.work);
> +	struct extcon_dev *edev = chg->cable.edev;
> +	int connector, state;
> +	int ret;
> +
> +	for (connector = EXTCON_USB_HOST; connector <= EXTCON_CHG_USB_PD;
> +	     connector++) {
> +		state = extcon_get_state(edev, connector);
> +		if (state == 1)
> +			break;
> +	}
> +
> +	switch (connector) {
> +	case EXTCON_CHG_USB_SDP:
> +	case EXTCON_CHG_USB_DCP:
> +	case EXTCON_CHG_USB_CDP:
> +	case EXTCON_CHG_USB_ACA:
> +	case EXTCON_CHG_USB_FAST:
> +	case EXTCON_CHG_USB_SLOW:
> +	case EXTCON_CHG_USB_PD:
> +		ret = max77693_set_charging(chg, true);
> +		if (ret) {
> +			dev_err(chg->dev, "failed to enable charging\n");
> +			break;
> +		}
> +		dev_info(chg->dev, "charging. connector type: %d\n",
> +			 connector);

This and next one should be also dev_dbg. It is completely normal
condition, kind of expected thing to happen, so users do not need to be
bugged every time they plugs cable.

> +		break;
> +	default:
> +		ret = max77693_set_charging(chg, false);
> +		if (ret) {
> +			dev_err(chg->dev, "failed to disable charging\n");
> +			break;
> +		}
> +		dev_info(chg->dev, "not charging. connector type: %d\n",
> +			 connector);
> +		break;
> +	}
> +
> +	power_supply_changed(chg->charger);
> +}
> +
> +static int max77693_charger_extcon_notifier(struct notifier_block *nb,
> +					  unsigned long event, void *param)
> +{
> +	struct max77693_charger *chg = container_of(nb, struct max77693_charger,
> +						    cable.nb);
> +
> +	schedule_work(&chg->cable.work);
> +
> +	return NOTIFY_OK;
> +}
> +
>  /*
>   * Sets charger registers to proper and safe default values.
>   */
> @@ -734,12 +814,34 @@ static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
>  {
>  	struct device_node *np = dev->of_node;
>  	struct power_supply_battery_info *battery_info;
> +	struct device_node *np_conn, *np_edev;
>  
>  	if (!np) {
>  		dev_err(dev, "no charger OF node\n");
>  		return -EINVAL;
>  	}
>  
> +	np_conn = of_parse_phandle(np, "maxim,usb-connector", 0);

Where is the reference dropped?

> +	if (np_conn) {
> +		np_edev = of_get_parent(np_conn);

Same question

> +
> +		chg->cable.edev = extcon_find_edev_by_node(np_edev);

You probably need device_link_add() as well. I don't think above extcon
code cares about it.

> +		if (IS_ERR(chg->cable.edev)) {
> +			/*
> +			 * In case of deferred extcon probe, defer our probe as well
> +			 * until it appears.
> +			 */
> +			if (PTR_ERR(chg->cable.edev) == -EPROBE_DEFER)
> +				return PTR_ERR(chg->cable.edev);
> +			/*
> +			 * Otherwise, ignore errors (the charger can run without a
> +			 * connector provided).
> +			 */
> +			dev_warn(dev, "no extcon device found in device-tree (%ld)\n",
> +				 PTR_ERR(chg->cable.edev));
> +		}
> +	}


Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 3e31375491d5..e4aeff9e7ad1 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -549,6 +549,7 @@  config CHARGER_MAX77650
 config CHARGER_MAX77693
 	tristate "Maxim MAX77693 battery charger driver"
 	depends on MFD_MAX77693
+	depends on EXTCON || !EXTCON
 	help
 	  Say Y to enable support for the Maxim MAX77693 battery charger.
 
diff --git a/drivers/power/supply/max77693_charger.c b/drivers/power/supply/max77693_charger.c
index 17975ec69a6a..d67857d2aa0b 100644
--- a/drivers/power/supply/max77693_charger.c
+++ b/drivers/power/supply/max77693_charger.c
@@ -5,6 +5,8 @@ 
 // Copyright (C) 2014 Samsung Electronics
 // Krzysztof Kozlowski <krzk@kernel.org>
 
+#include <linux/devm-helpers.h>
+#include <linux/extcon.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
@@ -28,6 +30,13 @@  struct max77693_charger {
 	u32 batttery_overcurrent;
 	u32 fast_charge_current;
 	u32 charge_input_threshold_volt;
+
+	/* USB cable notifications */
+	struct {
+		struct extcon_dev *edev;
+		struct notifier_block nb;
+		struct work_struct work;
+	} cable;
 };
 
 static int max77693_get_charger_state(struct regmap *regmap, int *val)
@@ -668,6 +677,77 @@  static int max77693_set_charge_input_threshold_volt(struct max77693_charger *chg
 			CHG_CNFG_12_VCHGINREG_MASK, data);
 }
 
+static int max77693_set_charging(struct max77693_charger *chg, bool enable)
+{
+	unsigned int data;
+
+	if (enable)
+		data = CHG_CNFG_00_CHG_MASK | CHG_CNFG_00_BUCK_MASK;
+	else
+		data = ~(CHG_CNFG_00_CHG_MASK | CHG_CNFG_00_BUCK_MASK);
+
+	return regmap_update_bits(chg->max77693->regmap,
+			MAX77693_CHG_REG_CHG_CNFG_00,
+			CHG_CNFG_00_CHG_MASK | CHG_CNFG_00_BUCK_MASK,
+			data);
+}
+
+static void max77693_charger_extcon_work(struct work_struct *work)
+{
+	struct max77693_charger *chg = container_of(work, struct max77693_charger,
+						  cable.work);
+	struct extcon_dev *edev = chg->cable.edev;
+	int connector, state;
+	int ret;
+
+	for (connector = EXTCON_USB_HOST; connector <= EXTCON_CHG_USB_PD;
+	     connector++) {
+		state = extcon_get_state(edev, connector);
+		if (state == 1)
+			break;
+	}
+
+	switch (connector) {
+	case EXTCON_CHG_USB_SDP:
+	case EXTCON_CHG_USB_DCP:
+	case EXTCON_CHG_USB_CDP:
+	case EXTCON_CHG_USB_ACA:
+	case EXTCON_CHG_USB_FAST:
+	case EXTCON_CHG_USB_SLOW:
+	case EXTCON_CHG_USB_PD:
+		ret = max77693_set_charging(chg, true);
+		if (ret) {
+			dev_err(chg->dev, "failed to enable charging\n");
+			break;
+		}
+		dev_info(chg->dev, "charging. connector type: %d\n",
+			 connector);
+		break;
+	default:
+		ret = max77693_set_charging(chg, false);
+		if (ret) {
+			dev_err(chg->dev, "failed to disable charging\n");
+			break;
+		}
+		dev_info(chg->dev, "not charging. connector type: %d\n",
+			 connector);
+		break;
+	}
+
+	power_supply_changed(chg->charger);
+}
+
+static int max77693_charger_extcon_notifier(struct notifier_block *nb,
+					  unsigned long event, void *param)
+{
+	struct max77693_charger *chg = container_of(nb, struct max77693_charger,
+						    cable.nb);
+
+	schedule_work(&chg->cable.work);
+
+	return NOTIFY_OK;
+}
+
 /*
  * Sets charger registers to proper and safe default values.
  */
@@ -734,12 +814,34 @@  static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
 {
 	struct device_node *np = dev->of_node;
 	struct power_supply_battery_info *battery_info;
+	struct device_node *np_conn, *np_edev;
 
 	if (!np) {
 		dev_err(dev, "no charger OF node\n");
 		return -EINVAL;
 	}
 
+	np_conn = of_parse_phandle(np, "maxim,usb-connector", 0);
+	if (np_conn) {
+		np_edev = of_get_parent(np_conn);
+
+		chg->cable.edev = extcon_find_edev_by_node(np_edev);
+		if (IS_ERR(chg->cable.edev)) {
+			/*
+			 * In case of deferred extcon probe, defer our probe as well
+			 * until it appears.
+			 */
+			if (PTR_ERR(chg->cable.edev) == -EPROBE_DEFER)
+				return PTR_ERR(chg->cable.edev);
+			/*
+			 * Otherwise, ignore errors (the charger can run without a
+			 * connector provided).
+			 */
+			dev_warn(dev, "no extcon device found in device-tree (%ld)\n",
+				 PTR_ERR(chg->cable.edev));
+		}
+	}
+
 	if (of_property_read_u32(np, "maxim,constant-microvolt",
 			&chg->constant_volt))
 		chg->constant_volt = DEFAULT_CONSTANT_VOLT;
@@ -811,6 +913,26 @@  static int max77693_charger_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
+	/* Set up extcon if the USB connector node was found */
+	if (!IS_ERR(chg->cable.edev)) {
+		ret = devm_work_autocancel(&pdev->dev, &chg->cable.work,
+					   max77693_charger_extcon_work);
+		if (ret) {
+			dev_err(&pdev->dev, "failed: initialize extcon work\n");
+			return ret;
+		}
+
+		chg->cable.nb.notifier_call = max77693_charger_extcon_notifier;
+
+		ret = devm_extcon_register_notifier_all(&pdev->dev,
+							chg->cable.edev,
+							&chg->cable.nb);
+		if (ret) {
+			dev_err(&pdev->dev, "failed: register extcon notifier\n");
+			return ret;
+		}
+	}
+
 	ret = device_create_file(&pdev->dev, &dev_attr_fast_charge_timer);
 	if (ret) {
 		dev_err(&pdev->dev, "failed: create fast charge timer sysfs entry\n");