extcon: max8997: Add CHGINS and CHGRM interrupt handling
Subsystems (6)
PATCH v3 1/7 extcon: max8997: Add CHGINS and CHGRM interrupt handling
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
@@ -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
PATCH v3 2/7 regulator: dt-bindings: Document max8997-pmic nodes
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
@@ -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
Re: [PATCH v3 2/7] regulator: dt-bindings: Document max8997-pmic nodes
Quoted 7 lines · Timon Baetz
Add maxim,max8997-battery and maxim,max8997-muic optional nodes.
Signed-off-by Timon Baetz <[email protected]>--- .../bindings/regulator/max8997-regulator.txt | 11 +++++++++++ 1 file changed, 11 insertions(+)
Best regards,
Krzysztof
PATCH v3 3/7 mfd: max8997: Add of_compatible to extcon and charger mfd_cell
In reply to Timon BaetzAdd of_compatible ("maxim,max8997-muic") to the mfd_cell to have a of_node set in the extcon driver.
Add of_compatible ("maxim,max8997-battery") to the mfd_cell to configure the charger driver.
--- drivers/mfd/max8997.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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" , }, { .name ="max8997-led" , .id =1 }, { .name ="max8997-led" , .id =2 }, };
Signature · 1 line
2.25.1
Re: [PATCH v3 3/7] mfd: max8997: Add of_compatible to extcon and charger mfd_cell
Quoted 10 lines · Timon Baetz
Add
of_compatible("maxim,max8997-muic") to themfd_cellto have aof_nodeset in the extcon driver.Add
of_compatible("maxim,max8997-battery") to themfd_cellto configure the charger driver.Signed-off-by Timon Baetz <[email protected]>--- drivers/mfd/max8997.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Best regards,
Krzysztof
Lee Jones
AppliedRe: [PATCH v3 3/7] mfd: max8997: Add of_compatible to extcon and charger mfd_cell
In reply to Timon BaetzQuoted 10 lines · Timon Baetz
Add
of_compatible("maxim,max8997-muic") to themfd_cellto have aof_nodeset in the extcon driver.Add
of_compatible("maxim,max8997-battery") to themfd_cellto configure the charger driver.Signed-off-by Timon Baetz <[email protected]>--- drivers/mfd/max8997.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH v3 3/7] mfd: max8997: Add of_compatible to extcon and charger mfd_cell
Quoted 8 lines · Lee Jones
Quoted 6 lines · Timon Baetz
Add
of_compatible("maxim,max8997-muic") to themfd_cellto have aof_nodeset in the extcon driver.Add
of_compatible("maxim,max8997-battery") to themfd_cellto configure the charger driver.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Timon Baetz <[email protected]>--- drivers/mfd/max8997.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)Applied, thanks.
Once https://lore.kernel.org/lkml/[email protected]/
gets accepted, this is not needed anymore. Can this be reverted or should I create a new patch?
Thanks,
Timon
Re: [PATCH v3 3/7] mfd: max8997: Add of_compatible to extcon and charger mfd_cell
Quoted 14 lines · Timon Baetz
Quoted 13 lines · Lee Jones
Quoted 10 lines · Timon Baetz
Add
of_compatible("maxim,max8997-muic") to themfd_cellto have aof_nodeset in the extcon driver.Add
of_compatible("maxim,max8997-battery") to themfd_cellto configure the charger driver.Signed-off-by Timon Baetz <[email protected]>--- drivers/mfd/max8997.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 5 lines
Quoted 1 line
Applied, thanks.
Once https://lore.kernel.org/lkml/[email protected]/
gets accepted, this is not needed anymore. Can this be reverted or should I create a new patch?
Please submit a revert with the reasons why.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH v3 4/7 power: supply: max8997_charger: Set CHARGER current limit
In reply to Timon BaetzRegister 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.
--- drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++ 1 file changed, 94 insertions(+)
drivers/power/supply/max8997_charger.c +94 -0
@@ -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; + +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 ) { +int 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); +return ; + } + ret =regulator_enable (charger->reg); +if (ret) +dev_err (charger->dev,"failed to enable regulator: %d\n" , ret); + }else { +int 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 ,
@@ -170,6 +237,33 @@ static int max8997_battery_probe(struct platform_device *pdev)return PTR_ERR (charger->battery); } + charger->reg =devm_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); + } + + charger->edev =extcon_get_edev_by_phandle (&pdev->dev,0 ); +if (IS_ERR (charger->edev)) { +if (PTR_ERR (charger->edev) != -EPROBE_DEFER ) +dev_err (charger->dev,"couldn't get extcon device\n" ); +return PTR_ERR (charger->edev); + } + +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_nb.notifier_call = max8997_battery_extcon_evt; + ret =devm_extcon_register_notifier_all (&pdev->dev, charger->edev, + &charger->extcon_nb); +if (ret) { +dev_err (&pdev->dev,"failed to register extcon notifier\n" ); +return ret; + }; +return 0 ; }
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerRe: [PATCH v3 4/7] power: supply: max8997_charger: Set CHARGER current limit
Quoted 112 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.
Signed-off-by Timon Baetz <[email protected]>--- drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++ 1 file changed, 94 insertions(+)drivers/power/supply/max8997_charger.c +67
-0@@ -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; + +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 ) { +int 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); +return ; + } + ret =regulator_enable (charger->reg); +if (ret) +dev_err (charger->dev,"failed to enable regulator: %d\n" , ret); + }else { +int 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 ,
drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 240
Quoted 4 lines
drivers/power/supply/max8997_charger.c +1
-0@@ -170,6 +237,33 @@ static int max8997_battery_probe(struct platform_device *pdev)return PTR_ERR (charger->battery); } + charger->reg =devm_regulator_get (&pdev->dev,"charger" );
The code looks good but isn't it breaking all existing platforms?
Best regards,
Krzysztof
Quoted 5 lines
drivers/power/supply/max8997_charger.c +5
-0+if (IS_ERR (charger->reg)) { +dev_err (&pdev->dev,"couldn't get charger regulator\n" ); +return PTR_ERR (charger->reg); + } +
Re: [PATCH v3 4/7] power: supply: max8997_charger: Set CHARGER current limit
Quoted 116 lines · Krzysztof Kozlowski
Quoted 115 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.
Signed-off-by Timon Baetz <[email protected]>--- drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++ 1 file changed, 94 insertions(+)drivers/power/supply/max8997_charger.c +67
-0@@ -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; + +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 ) { +int 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); +return ; + } + ret =regulator_enable (charger->reg); +if (ret) +dev_err (charger->dev,"failed to enable regulator: %d\n" , ret); + }else { +int 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 ,@@ -170,6 +237,33 @@ static int max8997_battery_probe(struct platform_device *pdev)return PTR_ERR (charger->battery); }
Quoted 3 lines
drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 240
Quoted 1 line
drivers/power/supply/max8997_charger.c +1
-0+ charger->reg =devm_regulator_get (&pdev->dev,"charger" );The code looks good but isn't it breaking all existing platforms?
So there is 2 other DTS in the kernel sources that are using MAX8997 pmic:
- Insignal Origen evaluation board
- Samsung Trats
Non of them have charging regulators.
Also probing of the charger has been failing for long time because of
https://lore.kernel.org/lkml/[email protected]/
but that seems to land in 5.11.
That being said, I guess I could make extcon and charger-supply optional if you prefer.
Thanks again for reviewing,
Timon
Krzysztof Kozlowski
maintainerRe: [PATCH v3 4/7] power: supply: max8997_charger: Set CHARGER current limit
Quoted 1 line · Timon Baetz
On Tue, 22 Dec 2020 09:40:04 +0100, Krzysztof Kozlowski wrote:
(...)
Quoted 10 lines
Quoted 9 lines
drivers/power/supply/max8997_charger.c static int max8997_battery_probe(struct platform_device *pdev) · line 240
Quoted 7 lines
drivers/power/supply/max8997_charger.c +1
-0.name = "max8997_pmic", .type = POWER_SUPPLY_TYPE_BATTERY,@@ -170,6 +237,33 @@ static int max8997_battery_probe(struct platform_device *pdev)return PTR_ERR (charger->battery); } + charger->reg =devm_regulator_get (&pdev->dev,"charger" );The code looks good but isn't it breaking all existing platforms?
Quoted 5 lines
So there is 2 other DTS in the kernel sources that are using MAX8997 pmic:
- Insignal Origen evaluation board
- Samsung Trats
Non of them have charging regulators.
But still the power supply was probing on them (if not the error you mentioned). Now, the charger will fail.
Quoted 3 lines
Also probing of the charger has been failing for long time because of
https://lore.kernel.org/lkml/[email protected]/
but that seems to land in 5.11.
That's a good argument supporting introduced breakage. Use it in commit message. Don't hide such information.
Quoted 2 lines
That being said, I guess I could make extcon and charger-supply optional if you prefer.
Since at least two boards will loose now power supply, I don't think you have a choice.
Best regards,
Krzysztof
PATCH v3 5/7 ARM: dts: exynos: Added muic and charger nodes for i9100
In reply to Timon Baetzmuic 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
@@ -584,6 +584,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
PATCH v3 6/7 ARM: dts: exynos: Fix charging regulator voltage and current for i9100
In reply to Timon BaetzSet CHARGER current and CHARGER_CV voltage according to Galaxy S2 Epic 4G Touch SPH-D710 Android 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
@@ -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 · 1 line
2.25.1
PATCH v3 7/7 ARM: dts: exynos: Add top-off charging regulator node for i9100
In reply to Timon BaetzValue taken from Galaxy S2 Epic 4G Touch SPH-D710 Android vendor kernel [0] which always sets 200mA.
Also rearrange regulators based on definition in max8997.h.
--- arch/arm/boot/dts/exynos4210-i9100.dts | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +14 -7
@@ -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"; + CHARGER_TOPOFF { + regulator-name = "CHARGER_TOPOFF"; + regulator-min-microamp = <200000>; + regulator-max-microamp = <200000>; regulator-always-on; }; };
Signature · 1 line
2.25.1