Skip to contentSkip to conversation

extcon: max8997: Add CHGINS and CHGRM interrupt handling

PATCH Superseded Timon Baetz 4 participants 25 messages Dec 2, 2020 – Dec 21, 2020

Subsystems (6)

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 extcon: max8997: Add CHGINS and CHGRM interrupt handling

Allows the MAX8997 charger to set the current limit depending on the detected extcon charger type.

---
 drivers/extcon/extcon-max8997.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/extcon/extcon-max8997.c +5 -0
index 172e116ac1ce..70ffcef12e3e 100644
@@ -44,6 +44,8 @@ static struct max8997_muic_irq muic_irqs[] = {
 	{ MAX8997_MUICIRQ_ChgDetRun,	"muic-CHGDETRUN" },
 	{ MAX8997_MUICIRQ_ChgTyp,	"muic-CHGTYP" },
 	{ MAX8997_MUICIRQ_OVP,		"muic-OVP" },
+	{ MAX8997_PMICIRQ_CHGINS,	"pmic-CHGINS" },
+	{ MAX8997_PMICIRQ_CHGRM,	"pmic-CHGRM" },
 };
 
 /* Define supported cable type */
@@ -538,6 +540,9 @@ static void max8997_muic_irq_work(struct work_struct *work)
 	case MAX8997_MUICIRQ_DCDTmr:
 	case MAX8997_MUICIRQ_ChgDetRun:
 	case MAX8997_MUICIRQ_ChgTyp:
+	case MAX8997_PMICIRQ_CHGINS:
+	case MAX8997_PMICIRQ_CHGRM:
+
 		/* Handle charger cable */
 		ret = max8997_muic_chg_handler(info);
 		break;
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 power: supply: max8997_charger: Set CHARGER current limit

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from i9100 kernel fork.

Enable and disable the CHARGER regulator based on extcon events and remove regulator-always-on from the device tree.

---
 arch/arm/boot/dts/exynos4210-i9100.dts |  1 -
 drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
arch/arm/boot/dts/exynos4210-i9100.dts +0 -1
index 6d0c04d77a39..9f8d927e0d21 100644
@@ -560,7 +560,6 @@ charger_reg: CHARGER {
 				regulator-name = "CHARGER";
 				regulator-min-microamp = <60000>;
 				regulator-max-microamp = <2580000>;
-				regulator-always-on;
 			};
 
 			chargercv_reg: CHARGER_CV {
drivers/power/supply/max8997_charger.c +92 -0

128 lines not on this page · raw message

Signature · 8 lines
2.25.1



_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw

Re: [PATCH 2/3] power: supply: max8997_charger: Set CHARGER current limit

Quoted 18 lines · Timon Baetz

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from i9100 kernel fork.

Enable and disable the CHARGER regulator based on extcon events and remove regulator-always-on from the device tree.

---
 arch/arm/boot/dts/exynos4210-i9100.dts |  1 -
 drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
arch/arm/boot/dts/exynos4210-i9100.dts +0 -0
index 6d0c04d77a39..9f8d927e0d21 100644

arch/arm/boot/dts/exynos4210-i9100.dts charger_reg: CHARGER { · line 563

Quoted 4 lines
arch/arm/boot/dts/exynos4210-i9100.dts +0 -1
@@ -560,7 +560,6 @@ charger_reg: CHARGER {
 				regulator-name = "CHARGER";
 				regulator-min-microamp = <60000>;
 				regulator-max-microamp = <2580000>;
-				regulator-always-on;

Thanks for the patch.

The DTS changes always go separately.

Quoted 16 lines
arch/arm/boot/dts/exynos4210-i9100.dts +0 -0
 			};
 
 			chargercv_reg: CHARGER_CV {
drivers/power/supply/max8997_charger.c +1 -0
index 1947af25879a..26cd271576ec 100644
@@ -6,6 +6,7 @@
 //  MyungJoo Ham <[email protected]>
 
 #include <linux/err.h>
+#include <linux/extcon.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

drivers/power/supply/max8997_charger.c struct charger_data { · line 35

Quoted 4 lines
drivers/power/supply/max8997_charger.c +1 -0
@@ -31,6 +32,12 @@ struct charger_data {
 	struct device *dev;
 	struct max8997_dev *iodev;
 	struct power_supply *battery;
+	struct regulator *reg;

You need to include regulator consumer.h.

drivers/power/supply/max8997_charger.c struct charger_data { · line 36

Quoted 1 line
drivers/power/supply/max8997_charger.c +1 -0
+	struct {

It makes all dereferences longer. Just add a comment that these are related to the extcon.

Quoted 15 lines
drivers/power/supply/max8997_charger.c +8 -0
+		struct extcon_dev *edev;
+		struct notifier_block nb;
+		struct work_struct work;
+	} extcon;
 };
 
 static enum power_supply_property max8997_battery_props[] = {
@@ -88,6 +95,63 @@ static int max8997_battery_get_property(struct power_supply *psy,
 	return 0;
 }
 
+static void max8997_battery_extcon_evt_stop_work(void *data)
+{
+	struct charger_data *charger = data;
+

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 111

Quoted 10 lines
drivers/power/supply/max8997_charger.c +10 -0
+	cancel_work_sync(&charger->extcon.work);
+}
+
+static void max8997_battery_extcon_evt_worker(struct work_struct *work)
+{
+	struct charger_data *charger =
+	    container_of(work, struct charger_data, extcon.work);
+	int ret, current_limit;
+	struct extcon_dev *edev = charger->extcon.edev;
+

It would be useful to report the current with POWER_SUPPLY_PROP_* but it is a different patch.

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 123

Quoted 12 lines
drivers/power/supply/max8997_charger.c +12 -0
+	if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
+		dev_dbg(charger->dev, "USB SDP charger is connected\n");
+		current_limit = 450000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
+		dev_dbg(charger->dev, "USB DCP charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) {
+		dev_dbg(charger->dev, "USB FAST charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) {
+		dev_dbg(charger->dev, "USB SLOW charger is connected\n");
+		current_limit = 650000;

The charger provides 500 mA, so I wonder whether 650 here is correct. Is it at different voltage?

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 132

Quoted 9 lines
drivers/power/supply/max8997_charger.c +9 -0
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
+		dev_dbg(charger->dev, "USB CDP charger is connected\n");
+		current_limit = 650000;
+	} else {
+		dev_dbg(charger->dev, "USB charger is diconnected\n");
+		current_limit = -1;
+	}
+
+	if (current_limit > 0) {

ret should be declared here.

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 135

Quoted 3 lines
drivers/power/supply/max8997_charger.c +3 -0
+		ret = regulator_set_current_limit(charger->reg, current_limit, current_limit);
+		if (ret)
+			dev_err(charger->dev, "failed to set current limit: %d\n", ret);

Failure of setting the current should rather disable the charging.

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 139

Quoted 4 lines
drivers/power/supply/max8997_charger.c +4 -0
+		ret = regulator_enable(charger->reg);
+		if (ret)
+			dev_err(charger->dev, "failed to enable regulator: %d\n", ret);
+	} else {

ret should be declared here.

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 143

Quoted 4 lines
drivers/power/supply/max8997_charger.c +4 -0
+		ret = regulator_disable(charger->reg);
+		if (ret)
+			dev_err(charger->dev, "failed to disable regulator: %d\n", ret);
+	}

What about top-off charging?

Quoted 23 lines
drivers/power/supply/max8997_charger.c +12 -0
+}
+
+static int max8997_battery_extcon_evt(struct notifier_block *nb,
+				unsigned long event, void *param)
+{
+	struct charger_data *charger =
+		container_of(nb, struct charger_data, extcon.nb);
+	schedule_work(&charger->extcon.work);
+	return NOTIFY_OK;
+}
+
 static const struct power_supply_desc max8997_battery_desc = {
 	.name		= "max8997_pmic",
 	.type		= POWER_SUPPLY_TYPE_BATTERY,
@@ -104,6 +168,7 @@ static int max8997_battery_probe(struct platform_device *pdev)
 	struct i2c_client *i2c = iodev->i2c;
 	struct max8997_platform_data *pdata = iodev->pdata;
 	struct power_supply_config psy_cfg = {};
+	struct extcon_dev *edev;
 
 	if (!pdata) {
 		dev_err(&pdev->dev, "No platform data supplied.\n");

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 219

Quoted 4 lines
drivers/power/supply/max8997_charger.c +1 -0
@@ -151,6 +216,12 @@ static int max8997_battery_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	edev = extcon_get_extcon_dev("max8997-muic");

Store it directly under charger->edev.

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 220

Quoted 1 line
drivers/power/supply/max8997_charger.c +1 -0
+	if (edev == NULL) {

if (!edev) {

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 221

Quoted 1 line
drivers/power/supply/max8997_charger.c +1 -0
+		dev_info(&pdev->dev, "extcon is not ready, probe deferred\n");

Do not print anything on deferrals.

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 244

Quoted 11 lines
drivers/power/supply/max8997_charger.c +4 -0
+		return -EPROBE_DEFER;
+	}
+
 	charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL);
 	if (!charger)
 		return -ENOMEM;
@@ -170,6 +241,27 @@ static int max8997_battery_probe(struct platform_device *pdev)
 		return PTR_ERR(charger->battery);
 	}
 
+	charger->reg = regulator_get(&pdev->dev, "CHARGER");

Here and in extcon_get_extcon_dev() - you make all these devices tightly coupled. It will work, but I am afraid it's easy to break later.

Instead you should have a device node in DTS to which the charger could bind and where the driver will find regulator supply and extcon phandles (with extcon_get_edev_by_phandle() for example).

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 253

Quoted 9 lines
drivers/power/supply/max8997_charger.c +9 -0
+	if (IS_ERR(charger->reg)) {
+		dev_err(&pdev->dev, "couldn't get CHARGER regulator\n");
+		return PTR_ERR(charger->reg);
+	}
+
+	INIT_WORK(&charger->extcon.work, max8997_battery_extcon_evt_worker);
+	ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);

Missing regulator_put() here and in other places. Use devm-().

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 259

Quoted 6 lines
drivers/power/supply/max8997_charger.c +6 -0
+		return ret;
+	}
+	charger->extcon.edev = edev;
+	charger->extcon.nb.notifier_call = max8997_battery_extcon_evt;
+	ret = devm_extcon_register_notifier_all(&pdev->dev, charger->extcon.edev,
+			&charger->extcon.nb);

Align the arguments with opening '('.

Best regards,
Krzysztof

#3 lore raw

Re: [PATCH 2/3] power: supply: max8997_charger: Set CHARGER current limit

Quoted 85 lines · Krzysztof Kozlowski
Quoted 18 lines · Timon Baetz

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from i9100 kernel fork.

Enable and disable the CHARGER regulator based on extcon events and remove regulator-always-on from the device tree.

---
 arch/arm/boot/dts/exynos4210-i9100.dts |  1 -
 drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
arch/arm/boot/dts/exynos4210-i9100.dts +0 -0
index 6d0c04d77a39..9f8d927e0d21 100644

arch/arm/boot/dts/exynos4210-i9100.dts charger_reg: CHARGER { · line 563

Quoted 4 lines
arch/arm/boot/dts/exynos4210-i9100.dts +0 -1
@@ -560,7 +560,6 @@ charger_reg: CHARGER {
 				regulator-name = "CHARGER";
 				regulator-min-microamp = <60000>;
 				regulator-max-microamp = <2580000>;
-				regulator-always-on;  

Thanks for the patch.

The DTS changes always go separately.

Quoted 16 lines
arch/arm/boot/dts/exynos4210-i9100.dts +0 -0
 			};
 
 			chargercv_reg: CHARGER_CV {
drivers/power/supply/max8997_charger.c +1 -0
index 1947af25879a..26cd271576ec 100644
@@ -6,6 +6,7 @@
 //  MyungJoo Ham <[email protected]>
 
 #include <linux/err.h>
+#include <linux/extcon.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

drivers/power/supply/max8997_charger.c struct charger_data { · line 35

Quoted 4 lines
drivers/power/supply/max8997_charger.c +1 -0
@@ -31,6 +32,12 @@ struct charger_data {
 	struct device *dev;
 	struct max8997_dev *iodev;
 	struct power_supply *battery;
+	struct regulator *reg;  

You need to include regulator consumer.h.

drivers/power/supply/max8997_charger.c struct charger_data { · line 36

Quoted 1 line
drivers/power/supply/max8997_charger.c +1 -0
+	struct {  

It makes all dereferences longer. Just add a comment that these are related to the extcon.

Quoted 15 lines
drivers/power/supply/max8997_charger.c +8 -0
+		struct extcon_dev *edev;
+		struct notifier_block nb;
+		struct work_struct work;
+	} extcon;
 };
 
 static enum power_supply_property max8997_battery_props[] = {
@@ -88,6 +95,63 @@ static int max8997_battery_get_property(struct power_supply *psy,
 	return 0;
 }
 
+static void max8997_battery_extcon_evt_stop_work(void *data)
+{
+	struct charger_data *charger = data;
+

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 111

Quoted 10 lines
drivers/power/supply/max8997_charger.c +10 -0
+	cancel_work_sync(&charger->extcon.work);
+}
+
+static void max8997_battery_extcon_evt_worker(struct work_struct *work)
+{
+	struct charger_data *charger =
+	    container_of(work, struct charger_data, extcon.work);
+	int ret, current_limit;
+	struct extcon_dev *edev = charger->extcon.edev;
+  

It would be useful to report the current with POWER_SUPPLY_PROP_* but it is a different patch.

Quoted 16 lines

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 123

Quoted 12 lines
drivers/power/supply/max8997_charger.c +12 -0
+	if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
+		dev_dbg(charger->dev, "USB SDP charger is connected\n");
+		current_limit = 450000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
+		dev_dbg(charger->dev, "USB DCP charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) {
+		dev_dbg(charger->dev, "USB FAST charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) {
+		dev_dbg(charger->dev, "USB SLOW charger is connected\n");
+		current_limit = 650000;  

The charger provides 500 mA, so I wonder whether 650 here is correct. Is it at different voltage?

I was wondering about that as well but as far as I can tell
https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/misc/max8997-muic.c#L1675-L1678
treats all 4 charger types as MUIC_CHG_TYPE_TA which ends up settings 650 mA. Voltage doesn't seem to change in vendor kernel.

Quoted 110 lines

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 132

Quoted 9 lines
drivers/power/supply/max8997_charger.c +9 -0
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
+		dev_dbg(charger->dev, "USB CDP charger is connected\n");
+		current_limit = 650000;
+	} else {
+		dev_dbg(charger->dev, "USB charger is diconnected\n");
+		current_limit = -1;
+	}
+
+	if (current_limit > 0) {  

ret should be declared here.

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 135

Quoted 3 lines
drivers/power/supply/max8997_charger.c +3 -0
+		ret = regulator_set_current_limit(charger->reg, current_limit, current_limit);
+		if (ret)
+			dev_err(charger->dev, "failed to set current limit: %d\n", ret);  

Failure of setting the current should rather disable the charging.

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 139

Quoted 4 lines
drivers/power/supply/max8997_charger.c +4 -0
+		ret = regulator_enable(charger->reg);
+		if (ret)
+			dev_err(charger->dev, "failed to enable regulator: %d\n", ret);
+	} else {  

ret should be declared here.

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 143

Quoted 4 lines
drivers/power/supply/max8997_charger.c +4 -0
+		ret = regulator_disable(charger->reg);
+		if (ret)
+			dev_err(charger->dev, "failed to disable regulator: %d\n", ret);
+	}  

What about top-off charging?

Quoted 23 lines
drivers/power/supply/max8997_charger.c +12 -0
+}
+
+static int max8997_battery_extcon_evt(struct notifier_block *nb,
+				unsigned long event, void *param)
+{
+	struct charger_data *charger =
+		container_of(nb, struct charger_data, extcon.nb);
+	schedule_work(&charger->extcon.work);
+	return NOTIFY_OK;
+}
+
 static const struct power_supply_desc max8997_battery_desc = {
 	.name		= "max8997_pmic",
 	.type		= POWER_SUPPLY_TYPE_BATTERY,
@@ -104,6 +168,7 @@ static int max8997_battery_probe(struct platform_device *pdev)
 	struct i2c_client *i2c = iodev->i2c;
 	struct max8997_platform_data *pdata = iodev->pdata;
 	struct power_supply_config psy_cfg = {};
+	struct extcon_dev *edev;
 
 	if (!pdata) {
 		dev_err(&pdev->dev, "No platform data supplied.\n");

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 219

Quoted 4 lines
drivers/power/supply/max8997_charger.c +1 -0
@@ -151,6 +216,12 @@ static int max8997_battery_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	edev = extcon_get_extcon_dev("max8997-muic");  

Store it directly under charger->edev.

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 220

Quoted 1 line
drivers/power/supply/max8997_charger.c +1 -0
+	if (edev == NULL) {  

if (!edev) {

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 221

Quoted 1 line
drivers/power/supply/max8997_charger.c +1 -0
+		dev_info(&pdev->dev, "extcon is not ready, probe deferred\n");  

Do not print anything on deferrals.

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 244

Quoted 11 lines
drivers/power/supply/max8997_charger.c +4 -0
+		return -EPROBE_DEFER;
+	}
+
 	charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL);
 	if (!charger)
 		return -ENOMEM;
@@ -170,6 +241,27 @@ static int max8997_battery_probe(struct platform_device *pdev)
 		return PTR_ERR(charger->battery);
 	}
 
+	charger->reg = regulator_get(&pdev->dev, "CHARGER");  

Here and in extcon_get_extcon_dev() - you make all these devices tightly coupled. It will work, but I am afraid it's easy to break later.

Instead you should have a device node in DTS to which the charger could bind and where the driver will find regulator supply and extcon phandles (with extcon_get_edev_by_phandle() for example).

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 253

Quoted 9 lines
drivers/power/supply/max8997_charger.c +9 -0
+	if (IS_ERR(charger->reg)) {
+		dev_err(&pdev->dev, "couldn't get CHARGER regulator\n");
+		return PTR_ERR(charger->reg);
+	}
+
+	INIT_WORK(&charger->extcon.work, max8997_battery_extcon_evt_worker);
+	ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);  

Missing regulator_put() here and in other places. Use devm-().

drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 259

Quoted 6 lines
drivers/power/supply/max8997_charger.c +6 -0
+		return ret;
+	}
+	charger->extcon.edev = edev;
+	charger->extcon.nb.notifier_call = max8997_battery_extcon_evt;
+	ret = devm_extcon_register_notifier_all(&pdev->dev, charger->extcon.edev,
+			&charger->extcon.nb);  

Align the arguments with opening '('.

Quoted 2 lines

Best regards,
Krzysztof

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

PATCH 3/3 ARM: dts: exynos: Fix charging regulator voltage and current for i9100

In reply to Timon Baetz

Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel fork.

---
 arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +4 -4
index 9f8d927e0d21..2700d53ea01b 100644
@@ -558,14 +558,14 @@ safe2_sreg: ESAFEOUT2 {
 
 			charger_reg: CHARGER {
 				regulator-name = "CHARGER";
-				regulator-min-microamp = <60000>;
-				regulator-max-microamp = <2580000>;
+				regulator-min-microamp = <200000>;
+				regulator-max-microamp = <950000>;
 			};
 
 			chargercv_reg: CHARGER_CV {
 				regulator-name = "CHARGER_CV";
-				regulator-min-microvolt = <3800000>;
-				regulator-max-microvolt = <4100000>;
+				regulator-min-microvolt = <4200000>;
+				regulator-max-microvolt = <4200000>;
 				regulator-always-on;
 			};
 		};
Signature · 1 line
2.25.1
#5 lore raw

Re: [PATCH 3/3] ARM: dts: exynos: Fix charging regulator voltage and current for i9100

Quoted 18 lines · Timon Baetz

Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel fork.

---
 arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +0 -2
index 9f8d927e0d21..2700d53ea01b 100644
@@ -558,14 +558,14 @@ safe2_sreg: ESAFEOUT2 {
 
 			charger_reg: CHARGER {
 				regulator-name = "CHARGER";
-				regulator-min-microamp = <60000>;
-				regulator-max-microamp = <2580000>;

arch/arm/boot/dts/exynos4210-i9100.dts safe2_sreg: ESAFEOUT2 { · line 568

Quoted 10 lines
arch/arm/boot/dts/exynos4210-i9100.dts +4 -2
+				regulator-min-microamp = <200000>;
+				regulator-max-microamp = <950000>;
 			};
 
 			chargercv_reg: CHARGER_CV {
 				regulator-name = "CHARGER_CV";
-				regulator-min-microvolt = <3800000>;
-				regulator-max-microvolt = <4100000>;
+				regulator-min-microvolt = <4200000>;
+				regulator-max-microvolt = <4200000>;

I am looking at my sources of Android 3.0 for GT-I9100 but I cannot find charger voltages for it. Where did you find it?

Best regards,
Krzysztof

#6 lore raw

Re: [PATCH 3/3] ARM: dts: exynos: Fix charging regulator voltage and current for i9100

Quoted 56 lines · Krzysztof Kozlowski
Quoted 40 lines · Timon Baetz

Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel fork.

------------------------------------------------------

arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +0 -5
index 9f8d927e0d21..2700d53ea01b 100644
@@ -558,14 +558,14 @@ safe2_sreg: ESAFEOUT2 {
 
      	charger_reg: CHARGER {
      		regulator-name = "CHARGER";
 
 
-       		regulator-min-microamp = <60000>;
 
 
-       		regulator-max-microamp = <2580000>;
 
 
 
-       		regulator-min-microamp = <200000>;
 
 
-       		regulator-max-microamp = <950000>;
        	};
 
        	chargercv_reg: CHARGER_CV {
        		regulator-name = "CHARGER_CV";
 
 
 
-       		regulator-min-microvolt = <3800000>;

arch/arm/boot/dts/exynos4210-i9100.dts safe2_sreg: ESAFEOUT2 {

Quoted 10 lines
arch/arm/boot/dts/exynos4210-i9100.dts +0 -3
 
 
-       		regulator-max-microvolt = <4100000>;
 
 
 
-       		regulator-min-microvolt = <4200000>;
 
 
-       		regulator-max-microvolt = <4200000>;

I am looking at my sources of Android 3.0 for GT-I9100 but I cannot find charger voltages for it. Where did you find it?

Quoted 2 lines

Best regards,
Krzysztof

Thanks all the feedback Krzysztof,

Voltage is set in the charger probe function of the downstream kernel fork: https://github.com/LineageOS/android_kernel_samsung_smdk4412/blob/lineage-17.0/drivers/power/max8997_charger_u1.c#L390-L391

Mainline uses the regulator: https://github.com/torvalds/linux/blob/master/drivers/regulator/max8997-regulator.c#L418-L419

#7 lore raw

Re: [PATCH 3/3] ARM: dts: exynos: Fix charging regulator voltage and current for i9100

Quoted 58 lines · Timon Bätz
Quoted 56 lines · Krzysztof Kozlowski
Quoted 40 lines · Timon Baetz

Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel fork.

------------------------------------------------------

arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +0 -5
index 9f8d927e0d21..2700d53ea01b 100644
@@ -558,14 +558,14 @@ safe2_sreg: ESAFEOUT2 {
 
      	charger_reg: CHARGER {
      		regulator-name = "CHARGER";
 
 
-       		regulator-min-microamp = <60000>;
 
 
-       		regulator-max-microamp = <2580000>;
 
 
 
-       		regulator-min-microamp = <200000>;
 
 
-       		regulator-max-microamp = <950000>;
        	};
 
        	chargercv_reg: CHARGER_CV {
        		regulator-name = "CHARGER_CV";
 
 
 
-       		regulator-min-microvolt = <3800000>;

arch/arm/boot/dts/exynos4210-i9100.dts safe2_sreg: ESAFEOUT2 {

Quoted 10 lines
arch/arm/boot/dts/exynos4210-i9100.dts +0 -3
 
 
-       		regulator-max-microvolt = <4100000>;
 
 
 
-       		regulator-min-microvolt = <4200000>;
 
 
-       		regulator-max-microvolt = <4200000>;

I am looking at my sources of Android 3.0 for GT-I9100 but I cannot find charger voltages for it. Where did you find it?

Quoted 6 lines
Quoted 2 lines

Best regards,
Krzysztof

Thanks all the feedback Krzysztof,

Voltage is set in the charger probe function of the downstream kernel fork: https://github.com/LineageOS/android_kernel_samsung_smdk4412/blob/lineage-17.0/drivers/power/max8997_charger_u1.c#L390-L391

You need to fix your email client to wrap lines.

The fork cannot be used as a reference because of poor quality of explanations for origins of the code.

The commit which added 4.2 V is described as "samsung update 1" which basically means nothing. If at least it was "drop sources of GT-I9105"... but in this form it is useless.

For the things we are not sure how they should be implemented, we sometimes accept the reason "vendor sources do like this". However Lineage or any other fork are not vendor sources.

Therefore you need to provide a valid explanation for this voltage change.

Best regards,
Krzysztof

#8 lore raw

Re: [PATCH 3/3] ARM: dts: exynos: Fix charging regulator voltage and current for i9100

Quoted 75 lines · Krzysztof Kozlowski
Quoted 58 lines · Timon Bätz
Quoted 56 lines · Krzysztof Kozlowski
Quoted 40 lines · Timon Baetz

Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel fork.

------------------------------------------------------

arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +0 -5
index 9f8d927e0d21..2700d53ea01b 100644
@@ -558,14 +558,14 @@ safe2_sreg: ESAFEOUT2 {
 
      	charger_reg: CHARGER {
      		regulator-name = "CHARGER";
 
 
-       		regulator-min-microamp = <60000>;
 
 
-       		regulator-max-microamp = <2580000>;
 
 
 
-       		regulator-min-microamp = <200000>;
 
 
-       		regulator-max-microamp = <950000>;
        	};
 
        	chargercv_reg: CHARGER_CV {
        		regulator-name = "CHARGER_CV";
 
 
 
-       		regulator-min-microvolt = <3800000>;

arch/arm/boot/dts/exynos4210-i9100.dts safe2_sreg: ESAFEOUT2 {

Quoted 10 lines
arch/arm/boot/dts/exynos4210-i9100.dts +0 -3
 
 
-       		regulator-max-microvolt = <4100000>;
 
 
 
-       		regulator-min-microvolt = <4200000>;
 
 
-       		regulator-max-microvolt = <4200000>;

I am looking at my sources of Android 3.0 for GT-I9100 but I cannot find charger voltages for it. Where did you find it?

Quoted 6 lines
Quoted 2 lines

Best regards,
Krzysztof

Thanks all the feedback Krzysztof,

Voltage is set in the charger probe function of the downstream kernel fork: https://github.com/LineageOS/android_kernel_samsung_smdk4412/blob/lineage-17.0/drivers/power/max8997_charger_u1.c#L390-L391

You need to fix your email client to wrap lines.

The fork cannot be used as a reference because of poor quality of explanations for origins of the code.

The commit which added 4.2 V is described as "samsung update 1" which basically means nothing. If at least it was "drop sources of GT-I9105"... but in this form it is useless.

Quoted 6 lines

For the things we are not sure how they should be implemented, we sometimes accept the reason "vendor sources do like this". However Lineage or any other fork are not vendor sources.

Therefore you need to provide a valid explanation for this voltage change.

I checked vendor sources for Samsung Galaxy S2 Epic 4G Touch (SPH-D710) and indeed it uses the max8997 charger U1 which sets v4.2 volts.

You can use it to fix up the commit msg.

Unfortunately it seems Samsung started to remove most of older kernel source code from their OS compliance page. S1, S2 and S3 are mostly gone. I was able to find just few remaining sources and I am now updating my vendor-dump with them. I'll upload them later to
https://github.com/krzk/linux-vendor-backup .

Best regards,
Krzysztof

#9 lore raw

Re: [PATCH 3/3] ARM: dts: exynos: Fix charging regulator voltage and current for i9100

Quoted 7 lines · Krzysztof Kozlowski

Unfortunately it seems Samsung started to remove most of older kernel source code from their OS compliance page. S1, S2 and S3 are mostly gone. I was able to find just few remaining sources and I am now updating my vendor-dump with them. I'll upload them later to
https://github.com/krzk/linux-vendor-backup .

I don't know why they keep removing older kernel sources (it's pretty stupid), but so far they added all of them back within a couple of days after I made an inquiry on https://opensource.samsung.com/requestInquiry
(Note: They remove them again after a while so backups are always
necessary...)

Might be worth a try if you need some of them :)

Stephan

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#10 lore raw

PATCH v2 1/6 extcon: max8997: Add CHGINS and CHGRM interrupt handling

In reply to Timon Baetz

This allows the MAX8997 charger to set the current limit depending on the detected extcon charger type.

---
 drivers/extcon/extcon-max8997.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/extcon/extcon-max8997.c +4 -0
index 337b0eea4e62..e1408075ef7d 100644
@@ -44,6 +44,8 @@ static struct max8997_muic_irq muic_irqs[] = {
 	{ MAX8997_MUICIRQ_ChgDetRun,	"muic-CHGDETRUN" },
 	{ MAX8997_MUICIRQ_ChgTyp,	"muic-CHGTYP" },
 	{ MAX8997_MUICIRQ_OVP,		"muic-OVP" },
+	{ MAX8997_PMICIRQ_CHGINS,	"pmic-CHGINS" },
+	{ MAX8997_PMICIRQ_CHGRM,	"pmic-CHGRM" },
 };
 
 /* Define supported cable type */
@@ -538,6 +540,8 @@ static void max8997_muic_irq_work(struct work_struct *work)
 	case MAX8997_MUICIRQ_DCDTmr:
 	case MAX8997_MUICIRQ_ChgDetRun:
 	case MAX8997_MUICIRQ_ChgTyp:
+	case MAX8997_PMICIRQ_CHGINS:
+	case MAX8997_PMICIRQ_CHGRM:
 		/* Handle charger cable */
 		ret = max8997_muic_chg_handler(info);
 		break;
Signature · 1 line
2.25.1
#11 lore raw

PATCH v2 2/6 power: supply: max8997_charger: Set CHARGER current limit

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from vendor kernel, where most charger types end up setting 650mA [0].

Also enable and disable the CHARGER regulator based on extcon events.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/misc/max8997-muic.c#L1675-L1678

---
 drivers/mfd/max8997.c                  |  4 +-
 drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 2 deletions(-)
drivers/mfd/max8997.c +2 -2
index 68d8f2b95287..55d3a6f97783 100644
@@ -29,9 +29,9 @@
 static const struct mfd_cell max8997_devs[] = {
 	{ .name = "max8997-pmic", },
 	{ .name = "max8997-rtc", },
-	{ .name = "max8997-battery", },
+	{ .name = "max8997-battery", .of_compatible = "maxim,max8997-battery", },
 	{ .name = "max8997-haptic", },
-	{ .name = "max8997-muic", },
+	{ .name = "max8997-muic", .of_compatible = "maxim,max8997-muic", },
 	{ .name = "max8997-led", .id = 1 },
 	{ .name = "max8997-led", .id = 2 },
 };
drivers/power/supply/max8997_charger.c +94 -0

124 lines not on this page · raw message

Signature · 1 line
2.25.1
#12 lore raw

Re: [PATCH v2 2/6] power: supply: max8997_charger: Set CHARGER current limit

Quoted 11 lines · Timon Baetz

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from vendor kernel, where most charger types end up setting 650mA [0].

Also enable and disable the CHARGER regulator based on extcon events.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/misc/max8997-muic.c#L1675-L1678

---
 drivers/mfd/max8997.c                  |  4 +-

Please split this out into a separate patch.

Quoted 2 lines
 drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 2 deletions(-)
Signature · 9 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#13 lore raw

Re: [PATCH v2 2/6] power: supply: max8997_charger: Set CHARGER current limit

In reply to Timon Baetz
Quoted 19 lines · Timon Baetz

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from vendor kernel, where most charger types end up setting 650mA [0].

Also enable and disable the CHARGER regulator based on extcon events.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/misc/max8997-muic.c#L1675-L1678

---
 drivers/mfd/max8997.c                  |  4 +-
 drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 2 deletions(-)
drivers/mfd/max8997.c +0 -0
index 68d8f2b95287..55d3a6f97783 100644

drivers/mfd/max8997.c line 34

Quoted 8 lines
drivers/mfd/max8997.c +2 -2
@@ -29,9 +29,9 @@
 static const struct mfd_cell max8997_devs[] = {
 	{ .name = "max8997-pmic", },
 	{ .name = "max8997-rtc", },
-	{ .name = "max8997-battery", },
+	{ .name = "max8997-battery", .of_compatible = "maxim,max8997-battery", },
 	{ .name = "max8997-haptic", },
-	{ .name = "max8997-muic", },
+	{ .name = "max8997-muic", .of_compatible = "maxim,max8997-muic", },

Undocumented bindings. The checkpatch should complain about it, so I assume you did not run it. Please run the checkpatch.

Quoted 66 lines
drivers/mfd/max8997.c +0 -0
 	{ .name = "max8997-led", .id = 1 },
 	{ .name = "max8997-led", .id = 2 },
 };
drivers/power/supply/max8997_charger.c +35 -0
index 1947af25879a..6e8750e455ea 100644
@@ -6,12 +6,14 @@
 //  MyungJoo Ham <[email protected]>
 
 #include <linux/err.h>
+#include <linux/extcon.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
+#include <linux/regulator/consumer.h>
 
 /* MAX8997_REG_STATUS4 */
 #define DCINOK_SHIFT		1
@@ -31,6 +33,10 @@ struct charger_data {
 	struct device *dev;
 	struct max8997_dev *iodev;
 	struct power_supply *battery;
+	struct regulator *reg;
+	struct extcon_dev *edev;
+	struct notifier_block extcon_nb;
+	struct work_struct extcon_work;
 };
 
 static enum power_supply_property max8997_battery_props[] = {
@@ -88,6 +94,67 @@ static int max8997_battery_get_property(struct power_supply *psy,
 	return 0;
 }
 
+static void max8997_battery_extcon_evt_stop_work(void *data)
+{
+	struct charger_data *charger = data;
+
+	cancel_work_sync(&charger->extcon_work);
+}
+
+static void max8997_battery_extcon_evt_worker(struct work_struct *work)
+{
+	struct charger_data *charger =
+	    container_of(work, struct charger_data, extcon_work);
+	struct extcon_dev *edev = charger->edev;
+	int current_limit, ret;
+
+	if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
+		dev_dbg(charger->dev, "USB SDP charger is connected\n");
+		current_limit = 450000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
+		dev_dbg(charger->dev, "USB DCP charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) {
+		dev_dbg(charger->dev, "USB FAST charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) {
+		dev_dbg(charger->dev, "USB SLOW charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
+		dev_dbg(charger->dev, "USB CDP charger is connected\n");
+		current_limit = 650000;

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 135

Quoted 10 lines
drivers/power/supply/max8997_charger.c +10 -0
+	} else {
+		dev_dbg(charger->dev, "USB charger is diconnected\n");
+		current_limit = -1;
+	}
+
+	if (current_limit > 0) {
+		ret = regulator_set_current_limit(charger->reg, current_limit, current_limit);
+		if (ret) {
+			dev_err(charger->dev, "failed to set current limit: %d\n", ret);
+			goto regulator_disable;

Unusual error path... if regulator was not enabled before and regulator_set_current_limit() failed, you disable the regulator? Why? Wasn't it already disabled?

Best regards,
Krzysztof

#14 lore raw

Re: [PATCH v2 2/6] power: supply: max8997_charger: Set CHARGER current limit

Quoted 104 lines · Krzysztof Kozlowski
Quoted 19 lines · Timon Baetz

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from vendor kernel, where most charger types end up setting 650mA [0].

Also enable and disable the CHARGER regulator based on extcon events.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/misc/max8997-muic.c#L1675-L1678

---
 drivers/mfd/max8997.c                  |  4 +-
 drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 2 deletions(-)
drivers/mfd/max8997.c +0 -0
index 68d8f2b95287..55d3a6f97783 100644

drivers/mfd/max8997.c line 34

Quoted 8 lines
drivers/mfd/max8997.c +2 -2
@@ -29,9 +29,9 @@
 static const struct mfd_cell max8997_devs[] = {
 	{ .name = "max8997-pmic", },
 	{ .name = "max8997-rtc", },
-	{ .name = "max8997-battery", },
+	{ .name = "max8997-battery", .of_compatible = "maxim,max8997-battery", },
 	{ .name = "max8997-haptic", },
-	{ .name = "max8997-muic", },
+	{ .name = "max8997-muic", .of_compatible = "maxim,max8997-muic", },  

Undocumented bindings. The checkpatch should complain about it, so I assume you did not run it. Please run the checkpatch.

Quoted 72 lines
drivers/mfd/max8997.c +0 -0
 	{ .name = "max8997-led", .id = 1 },
 	{ .name = "max8997-led", .id = 2 },
 };
drivers/power/supply/max8997_charger.c +41 -0
index 1947af25879a..6e8750e455ea 100644
@@ -6,12 +6,14 @@
 //  MyungJoo Ham <[email protected]>
 
 #include <linux/err.h>
+#include <linux/extcon.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
+#include <linux/regulator/consumer.h>
 
 /* MAX8997_REG_STATUS4 */
 #define DCINOK_SHIFT		1
@@ -31,6 +33,10 @@ struct charger_data {
 	struct device *dev;
 	struct max8997_dev *iodev;
 	struct power_supply *battery;
+	struct regulator *reg;
+	struct extcon_dev *edev;
+	struct notifier_block extcon_nb;
+	struct work_struct extcon_work;
 };
 
 static enum power_supply_property max8997_battery_props[] = {
@@ -88,6 +94,67 @@ static int max8997_battery_get_property(struct power_supply *psy,
 	return 0;
 }
 
+static void max8997_battery_extcon_evt_stop_work(void *data)
+{
+	struct charger_data *charger = data;
+
+	cancel_work_sync(&charger->extcon_work);
+}
+
+static void max8997_battery_extcon_evt_worker(struct work_struct *work)
+{
+	struct charger_data *charger =
+	    container_of(work, struct charger_data, extcon_work);
+	struct extcon_dev *edev = charger->edev;
+	int current_limit, ret;
+
+	if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
+		dev_dbg(charger->dev, "USB SDP charger is connected\n");
+		current_limit = 450000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
+		dev_dbg(charger->dev, "USB DCP charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) {
+		dev_dbg(charger->dev, "USB FAST charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) {
+		dev_dbg(charger->dev, "USB SLOW charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
+		dev_dbg(charger->dev, "USB CDP charger is connected\n");
+		current_limit = 650000;
+	} else {
+		dev_dbg(charger->dev, "USB charger is diconnected\n");
+		current_limit = -1;
+	}
+
+	if (current_limit > 0) {
Quoted 8 lines

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 135

Quoted 4 lines
drivers/power/supply/max8997_charger.c +4 -0
+		ret = regulator_set_current_limit(charger->reg, current_limit, current_limit);
+		if (ret) {
+			dev_err(charger->dev, "failed to set current limit: %d\n", ret);
+			goto regulator_disable;  

Unusual error path... if regulator was not enabled before and regulator_set_current_limit() failed, you disable the regulator? Why? Wasn't it already disabled?

Because I thought you asked me to in v1 of this patch:

Quoted 1 line

Failure of setting the current should rather disable the charging.

I probably misunderstood you comment then. So I guess it should just return?

Thanks for reviewing,
Timon

#15 lore raw

Re: [PATCH v2 2/6] power: supply: max8997_charger: Set CHARGER current limit

Quoted 114 lines · Timon Baetz
Quoted 104 lines · Krzysztof Kozlowski
Quoted 19 lines · Timon Baetz

Register for extcon notification and set charging current depending on the detected cable type. Current values are taken from vendor kernel, where most charger types end up setting 650mA [0].

Also enable and disable the CHARGER regulator based on extcon events.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/misc/max8997-muic.c#L1675-L1678

---
 drivers/mfd/max8997.c                  |  4 +-
 drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 2 deletions(-)
drivers/mfd/max8997.c +0 -0
index 68d8f2b95287..55d3a6f97783 100644

drivers/mfd/max8997.c line 34

Quoted 8 lines
drivers/mfd/max8997.c +2 -2
@@ -29,9 +29,9 @@
 static const struct mfd_cell max8997_devs[] = {
 	{ .name = "max8997-pmic", },
 	{ .name = "max8997-rtc", },
-	{ .name = "max8997-battery", },
+	{ .name = "max8997-battery", .of_compatible = "maxim,max8997-battery", },
 	{ .name = "max8997-haptic", },
-	{ .name = "max8997-muic", },
+	{ .name = "max8997-muic", .of_compatible = "maxim,max8997-muic", },  

Undocumented bindings. The checkpatch should complain about it, so I assume you did not run it. Please run the checkpatch.

Quoted 72 lines
drivers/mfd/max8997.c +0 -0
 	{ .name = "max8997-led", .id = 1 },
 	{ .name = "max8997-led", .id = 2 },
 };
drivers/power/supply/max8997_charger.c +41 -0
index 1947af25879a..6e8750e455ea 100644
@@ -6,12 +6,14 @@
 //  MyungJoo Ham <[email protected]>
 
 #include <linux/err.h>
+#include <linux/extcon.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
+#include <linux/regulator/consumer.h>
 
 /* MAX8997_REG_STATUS4 */
 #define DCINOK_SHIFT		1
@@ -31,6 +33,10 @@ struct charger_data {
 	struct device *dev;
 	struct max8997_dev *iodev;
 	struct power_supply *battery;
+	struct regulator *reg;
+	struct extcon_dev *edev;
+	struct notifier_block extcon_nb;
+	struct work_struct extcon_work;
 };
 
 static enum power_supply_property max8997_battery_props[] = {
@@ -88,6 +94,67 @@ static int max8997_battery_get_property(struct power_supply *psy,
 	return 0;
 }
 
+static void max8997_battery_extcon_evt_stop_work(void *data)
+{
+	struct charger_data *charger = data;
+
+	cancel_work_sync(&charger->extcon_work);
+}
+
+static void max8997_battery_extcon_evt_worker(struct work_struct *work)
+{
+	struct charger_data *charger =
+	    container_of(work, struct charger_data, extcon_work);
+	struct extcon_dev *edev = charger->edev;
+	int current_limit, ret;
+
+	if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
+		dev_dbg(charger->dev, "USB SDP charger is connected\n");
+		current_limit = 450000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
+		dev_dbg(charger->dev, "USB DCP charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) {
+		dev_dbg(charger->dev, "USB FAST charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) {
+		dev_dbg(charger->dev, "USB SLOW charger is connected\n");
+		current_limit = 650000;
+	} else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
+		dev_dbg(charger->dev, "USB CDP charger is connected\n");
+		current_limit = 650000;
+	} else {
+		dev_dbg(charger->dev, "USB charger is diconnected\n");
+		current_limit = -1;
+	}
+
+	if (current_limit > 0) {
Quoted 8 lines

drivers/power/supply/max8997_charger.c static int max8997_battery_get_property(struct power_supply *psy, · line 135

Quoted 4 lines
drivers/power/supply/max8997_charger.c +4 -0
+		ret = regulator_set_current_limit(charger->reg, current_limit, current_limit);
+		if (ret) {
+			dev_err(charger->dev, "failed to set current limit: %d\n", ret);
+			goto regulator_disable;  

Unusual error path... if regulator was not enabled before and regulator_set_current_limit() failed, you disable the regulator? Why? Wasn't it already disabled?

Quoted 5 lines

Because I thought you asked me to in v1 of this patch:

Quoted 1 line

Failure of setting the current should rather disable the charging.

I probably misunderstood you comment then. So I guess it should just return?

Yes, I was not specific enough. In v1 you enabled the charging even in case of regulator_set_current_limit() error. Instead, the charging should not be enabled, so just return here with error.

Best regards,
Krzysztof

#16 lore raw

PATCH v2 3/6 ARM: dts: exynos: Fix charging regulator voltage and current for i9100

In reply to Timon Baetz

Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 vendor sources [0,1].

Remove regulator-always-on. The regulator can be enabled and disabled based on extcon events.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/power/max8997_charger_u1.c#L169-L170
[1] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/power/max8997_charger_u1.c#L390-L391

---
 arch/arm/boot/dts/exynos4210-i9100.dts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +4 -5
index 5370ee477186..56ae534402bb 100644
@@ -562,15 +562,14 @@ safe2_sreg: ESAFEOUT2 {
 
 			charger_reg: CHARGER {
 				regulator-name = "CHARGER";
-				regulator-min-microamp = <60000>;
-				regulator-max-microamp = <2580000>;
-				regulator-always-on;
+				regulator-min-microamp = <200000>;
+				regulator-max-microamp = <950000>;
 			};
 
 			chargercv_reg: CHARGER_CV {
 				regulator-name = "CHARGER_CV";
-				regulator-min-microvolt = <3800000>;
-				regulator-max-microvolt = <4100000>;
+				regulator-min-microvolt = <4200000>;
+				regulator-max-microvolt = <4200000>;
 				regulator-always-on;
 			};
 
Signature · 8 lines
2.25.1



_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#17 lore raw

Re: [PATCH v2 3/6] ARM: dts: exynos: Fix charging regulator voltage and current for i9100

Quoted 2 lines · Timon Baetz

Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 vendor sources [0,1].

Mention that the vendor sources are for Galaxy S2 Epic 4G Touch SPH-D710 Android.

This seems to depend on driver changes, so it will have to wait till they reach mainline.

Best regards,
Krzysztof

#18 lore raw

PATCH v2 4/6 ARM: dts: exynos: Added muic and charger nodes for i9100

In reply to Timon Baetz

muic node is only used for extcon consumers. charger node is used to specify muic and regulator.

---
 arch/arm/boot/dts/exynos4210-i9100.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm/boot/dts/exynos4210-i9100.dts +10 -0
index 56ae534402bb..586d801af0b5 100644
@@ -583,6 +583,16 @@ EN32KHZ_CP {
 				regulator-always-on;
 			};
 		};
+
+		muic: max8997-muic {
+			compatible = "maxim,max8997-muic";
+		};
+
+		charger {
+			compatible = "maxim,max8997-battery";
+			charger-supply = <&charger_reg>;
+			extcon = <&muic>;
+		};
 	};
 };
 
Signature · 1 line
2.25.1
#19 lore raw

Re: [PATCH v2 4/6] ARM: dts: exynos: Added muic and charger nodes for i9100

Quoted 7 lines · Timon Baetz

muic node is only used for extcon consumers. charger node is used to specify muic and regulator.

---
 arch/arm/boot/dts/exynos4210-i9100.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)

Arrange your patches within the patchset in a way preserving bisectability. If 3/7 is applied, the charger will be off because kernel disables unused regulators.

Best regards,
Krzysztof

#20 lore raw

PATCH v2 5/6 ARM: dts: exynos: Added top-off charging regulator node for i9100

In reply to Timon Baetz

Value taken from Galaxy S2 vendor kernel [0] which always sets 200mA.

Also rearrange regulators based on definition in max8997.h.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/power/sec_battery_u1.c#L1525

---
 arch/arm/boot/dts/exynos4210-i9100.dts | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +14 -7
index 586d801af0b5..fec6da64f7c1 100644
@@ -560,6 +560,16 @@ safe2_sreg: ESAFEOUT2 {
 				regulator-boot-on;
 			};
 
+			EN32KHZ_AP {
+				regulator-name = "EN32KHZ_AP";
+				regulator-always-on;
+			};
+
+			EN32KHZ_CP {
+				regulator-name = "EN32KHZ_CP";
+				regulator-always-on;
+			};
+
 			charger_reg: CHARGER {
 				regulator-name = "CHARGER";
 				regulator-min-microamp = <200000>;
@@ -573,13 +583,10 @@ chargercv_reg: CHARGER_CV {
 				regulator-always-on;
 			};
 
-			EN32KHZ_AP {
-				regulator-name = "EN32KHZ_AP";
-				regulator-always-on;
-			};
-
-			EN32KHZ_CP {
-				regulator-name = "EN32KHZ_CP";
+			chargertopoff_reg: CHARGER_TOPOFF {
+				regulator-name = "CHARGER_TOPOFF";
+				regulator-min-microamp = <200000>;
+				regulator-max-microamp = <200000>;
 				regulator-always-on;
 			};
 		};
Signature · 1 line
2.25.1
#21 lore raw

Re: [PATCH v2 5/6] ARM: dts: exynos: Added top-off charging regulator node for i9100

Quoted 1 line · Timon Baetz

Value taken from Galaxy S2 vendor kernel [0] which always sets 200mA.

Subject: "Add", not "Added", as in Linux coding style.

Quoted 33 lines

Also rearrange regulators based on definition in max8997.h.

[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/power/sec_battery_u1.c#L1525

---
 arch/arm/boot/dts/exynos4210-i9100.dts | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +10 -0
index 586d801af0b5..fec6da64f7c1 100644
@@ -560,6 +560,16 @@ safe2_sreg: ESAFEOUT2 {
 				regulator-boot-on;
 			};
 
+			EN32KHZ_AP {
+				regulator-name = "EN32KHZ_AP";
+				regulator-always-on;
+			};
+
+			EN32KHZ_CP {
+				regulator-name = "EN32KHZ_CP";
+				regulator-always-on;
+			};
+
 			charger_reg: CHARGER {
 				regulator-name = "CHARGER";
 				regulator-min-microamp = <200000>;
@@ -573,13 +583,10 @@ chargercv_reg: CHARGER_CV {
 				regulator-always-on;

arch/arm/boot/dts/exynos4210-i9100.dts chargercv_reg: CHARGER_CV { · line 586

Quoted 10 lines
arch/arm/boot/dts/exynos4210-i9100.dts +1 -7
 			};
 
-			EN32KHZ_AP {
-				regulator-name = "EN32KHZ_AP";
-				regulator-always-on;
-			};
-
-			EN32KHZ_CP {
-				regulator-name = "EN32KHZ_CP";
+			chargertopoff_reg: CHARGER_TOPOFF {

No need for label "chargertopoff_reg".

Best regards,
Krzysztof

#22 lore raw

PATCH v2 6/6 regulator: dt-bindings: Document max8997-pmic nodes

In reply to Timon Baetz

Add maxim,max8997-battery and maxim,max8997-muic optional nodes.

---
 .../bindings/regulator/max8997-regulator.txt          | 11 +++++++++++
 1 file changed, 11 insertions(+)
Documentation/devicetree/bindings/regulator/max8997-regulator.txt +11 -0
index 6fe825b8ac1b..f969fc09fe29 100644
@@ -53,6 +53,17 @@ Additional properties required if either of the optional properties are used:
 - max8997,pmic-buck125-dvs-gpios: GPIO specifiers for three host gpio's used
   for dvs. The format of the gpio specifier depends in the gpio controller.
 
+Optional nodes:
+- charger: Node for configuring the charger driver.
+  Required properties:
+  - compatible: "maxim,max8997-battery"
+  - extcon: extcon specifier for charging events
+  - charger-supply: regulator node for charging current
+
+- muic: Node used only by extcon consumers.
+  Required properties:
+  - compatible: "maxim,max8997-muic"
+
 Regulators: The regulators of max8997 that have to be instantiated should be
 included in a sub-node named 'regulators'. Regulator nodes included in this
 sub-node should be of the format as listed below.
Signature · 1 line
2.25.1
#23 lore raw

Re: [PATCH v2 6/6] regulator: dt-bindings: Document max8997-pmic nodes

Quoted 6 lines · Timon Baetz

Add maxim,max8997-battery and maxim,max8997-muic optional nodes.

---
 .../bindings/regulator/max8997-regulator.txt          | 11 +++++++++++
 1 file changed, 11 insertions(+)

I see you updated the bindings. However if you run scripts/checkpatch, it would say that bindings go as first patch, so please re-order.

Best regards,
Krzysztof