Allows the MAX8997 charger to set the current limit depending on
the detected extcon charger type.
Signed-off-by: Timon Baetz <[email protected]>
---
drivers/extcon/extcon-max8997.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 172e116ac1ce..70ffcef12e3e 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -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;
--
2.25.1
Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel
fork.
Signed-off-by: Timon Baetz <[email protected]>
---
arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
index 9f8d927e0d21..2700d53ea01b 100644
--- a/arch/arm/boot/dts/exynos4210-i9100.dts
+++ b/arch/arm/boot/dts/exynos4210-i9100.dts
@@ -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;
};
};
--
2.25.1
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.
Signed-off-by: Timon Baetz <[email protected]>
---
arch/arm/boot/dts/exynos4210-i9100.dts | 1 -
drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++
2 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
index 6d0c04d77a39..9f8d927e0d21 100644
--- a/arch/arm/boot/dts/exynos4210-i9100.dts
+++ b/arch/arm/boot/dts/exynos4210-i9100.dts
@@ -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 {
diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
index 1947af25879a..26cd271576ec 100644
--- a/drivers/power/supply/max8997_charger.c
+++ b/drivers/power/supply/max8997_charger.c
@@ -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>
@@ -31,6 +32,12 @@ struct charger_data {
struct device *dev;
struct max8997_dev *iodev;
struct power_supply *battery;
+ struct regulator *reg;
+ struct {
+ 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;
+
+ 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;
+
+ 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) {
+ 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);
+ ret = regulator_enable(charger->reg);
+ if (ret)
+ dev_err(charger->dev, "failed to enable regulator: %d\n", ret);
+ } else {
+ ret = regulator_disable(charger->reg);
+ if (ret)
+ dev_err(charger->dev, "failed to disable regulator: %d\n", ret);
+ }
+}
+
+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");
@@ -151,6 +216,12 @@ static int max8997_battery_probe(struct platform_device *pdev)
return ret;
}
+ edev = extcon_get_extcon_dev("max8997-muic");
+ if (edev == NULL) {
+ dev_info(&pdev->dev, "extcon is not ready, probe deferred\n");
+ 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");
+ 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);
+ 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);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to register extcon notifier\n");
+ return ret;
+ };
+
return 0;
}
--
2.25.1
On Wed, Dec 02, 2020 at 09:07:19PM +0000, Timon Baetz wrote:
> 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.
>
> Signed-off-by: Timon Baetz <[email protected]>
> ---
> arch/arm/boot/dts/exynos4210-i9100.dts | 1 -
> drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++
> 2 files changed, 92 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
> index 6d0c04d77a39..9f8d927e0d21 100644
> --- a/arch/arm/boot/dts/exynos4210-i9100.dts
> +++ b/arch/arm/boot/dts/exynos4210-i9100.dts
> @@ -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.
> };
>
> chargercv_reg: CHARGER_CV {
> diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
> index 1947af25879a..26cd271576ec 100644
> --- a/drivers/power/supply/max8997_charger.c
> +++ b/drivers/power/supply/max8997_charger.c
> @@ -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>
> @@ -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.
> + struct {
It makes all dereferences longer. Just add a comment that these are
related to the extcon.
> + 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;
> +
> + 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.
> + 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?
> + } 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.
> + 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.
> + ret = regulator_enable(charger->reg);
> + if (ret)
> + dev_err(charger->dev, "failed to enable regulator: %d\n", ret);
> + } else {
ret should be declared here.
> + ret = regulator_disable(charger->reg);
> + if (ret)
> + dev_err(charger->dev, "failed to disable regulator: %d\n", ret);
> + }
What about top-off charging?
> +}
> +
> +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");
> @@ -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.
> + if (edev == NULL) {
if (!edev) {
> + dev_info(&pdev->dev, "extcon is not ready, probe deferred\n");
Do not print anything on deferrals.
> + 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).
> + 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-().
> + 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
On Wed, Dec 02, 2020 at 09:07:28PM +0000, Timon Baetz wrote:
> Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel
> fork.
>
> Signed-off-by: Timon Baetz <[email protected]>
> ---
> arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
> index 9f8d927e0d21..2700d53ea01b 100644
> --- a/arch/arm/boot/dts/exynos4210-i9100.dts
> +++ b/arch/arm/boot/dts/exynos4210-i9100.dts
> @@ -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>;
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
On Wednesday, December 2, 2020 11:04 PM, Krzysztof Kozlowski <[email protected]> wrote:
> On Wed, Dec 02, 2020 at 09:07:28PM +0000, Timon Baetz wrote:
>
> > Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel
> > fork.
> >
> > Signed-off-by: Timon Baetz [email protected]
> >
> > ------------------------------------------------------
> >
> > arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
> > index 9f8d927e0d21..2700d53ea01b 100644
> > --- a/arch/arm/boot/dts/exynos4210-i9100.dts
> > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts
> > @@ -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>;
> >
> >
>
> 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
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
On Thu, Dec 03, 2020 at 05:46:03AM +0000, Timon Bätz wrote:
> On Wednesday, December 2, 2020 11:04 PM, Krzysztof Kozlowski <[email protected]> wrote:
>
> > On Wed, Dec 02, 2020 at 09:07:28PM +0000, Timon Baetz wrote:
> >
> > > Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel
> > > fork.
> > >
> > > Signed-off-by: Timon Baetz [email protected]
> > >
> > > ------------------------------------------------------
> > >
> > > arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----
> > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
> > > index 9f8d927e0d21..2700d53ea01b 100644
> > > --- a/arch/arm/boot/dts/exynos4210-i9100.dts
> > > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts
> > > @@ -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>;
> > >
> > >
> >
> > 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
>
> 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
On Thu, Dec 03, 2020 at 10:23:01AM +0200, Krzysztof Kozlowski wrote:
> On Thu, Dec 03, 2020 at 05:46:03AM +0000, Timon Bätz wrote:
> > On Wednesday, December 2, 2020 11:04 PM, Krzysztof Kozlowski <[email protected]> wrote:
> >
> > > On Wed, Dec 02, 2020 at 09:07:28PM +0000, Timon Baetz wrote:
> > >
> > > > Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 kernel
> > > > fork.
> > > >
> > > > Signed-off-by: Timon Baetz [email protected]
> > > >
> > > > ------------------------------------------------------
> > > >
> > > > arch/arm/boot/dts/exynos4210-i9100.dts | 8 ++++----
> > > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > > > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
> > > > index 9f8d927e0d21..2700d53ea01b 100644
> > > > --- a/arch/arm/boot/dts/exynos4210-i9100.dts
> > > > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts
> > > > @@ -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>;
> > > >
> > > >
> > >
> > > 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
> >
> > 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.
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
On Thu, Dec 03, 2020 at 11:50:41AM +0200, Krzysztof Kozlowski wrote:
>
> 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
On Wed, 2 Dec 2020 23:50:57 +0200, Krzysztof Kozlowski wrote:
> On Wed, Dec 02, 2020 at 09:07:19PM +0000, Timon Baetz wrote:
> > 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.
> >
> > Signed-off-by: Timon Baetz <[email protected]>
> > ---
> > arch/arm/boot/dts/exynos4210-i9100.dts | 1 -
> > drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++
> > 2 files changed, 92 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
> > index 6d0c04d77a39..9f8d927e0d21 100644
> > --- a/arch/arm/boot/dts/exynos4210-i9100.dts
> > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts
> > @@ -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.
>
> > };
> >
> > chargercv_reg: CHARGER_CV {
> > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
> > index 1947af25879a..26cd271576ec 100644
> > --- a/drivers/power/supply/max8997_charger.c
> > +++ b/drivers/power/supply/max8997_charger.c
> > @@ -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>
> > @@ -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.
>
> > + struct {
>
> It makes all dereferences longer. Just add a comment that these are
> related to the extcon.
>
> > + 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;
> > +
> > + 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.
>
> > + 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.
> > + } 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.
>
> > + 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.
>
> > + ret = regulator_enable(charger->reg);
> > + if (ret)
> > + dev_err(charger->dev, "failed to enable regulator: %d\n", ret);
> > + } else {
>
> ret should be declared here.
>
> > + ret = regulator_disable(charger->reg);
> > + if (ret)
> > + dev_err(charger->dev, "failed to disable regulator: %d\n", ret);
> > + }
>
> What about top-off charging?
>
> > +}
> > +
> > +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");
> > @@ -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.
>
> > + if (edev == NULL) {
>
> if (!edev) {
>
> > + dev_info(&pdev->dev, "extcon is not ready, probe deferred\n");
>
> Do not print anything on deferrals.
>
> > + 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).
>
> > + 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-().
>
> > + 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
This allows the MAX8997 charger to set the current limit depending on
the detected extcon charger type.
Signed-off-by: Timon Baetz <[email protected]>
---
drivers/extcon/extcon-max8997.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 337b0eea4e62..e1408075ef7d 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -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;
--
2.25.1
On Mon, Dec 21, 2020 at 09:53:08AM +0000, Timon Baetz wrote:
> This allows the MAX8997 charger to set the current limit depending on
> the detected extcon charger type.
>
> Signed-off-by: Timon Baetz <[email protected]>
Don't do this:
In-Reply-To: <[email protected]>
It's a v2, so new thread. If you want to reference previous work, paste
a link from lore.kernel.org.
Best regards,
Krzysztof