* [PATCH 0/2] Add Richtek RT9471 3A battery charger support @ 2022-08-11 13:41 cy_huang 2022-08-11 13:41 ` [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger cy_huang 2022-08-11 13:41 ` [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver cy_huang 0 siblings, 2 replies; 16+ messages in thread From: cy_huang @ 2022-08-11 13:41 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, sre Cc: alina_yu, cy_huang, alinayu829, linux-pm, devicetree, linux-kernel From: ChiYuan Huang <cy_huang@richtek.com> This patch set is to add Richtek RT9471 charger support. The RT9471/D is a highly-integrated 3A switch mode battery charge management and system power path management device for single cell Li-Ion and Li-polymer battery. The low impedance power path optimizes switch-mode operation efficiency, reduces battery charging time and extends battery life during discharging phase. ChiYuan Huang (2): dt-bindings: power: supply: Add Richtek RT9471 battery charger power: supply: rt9471: Add Richtek RT9471 charger driver .../bindings/power/supply/richtek,rt9471.yaml | 78 ++ drivers/power/supply/Kconfig | 16 + drivers/power/supply/Makefile | 1 + drivers/power/supply/rt9471.c | 952 +++++++++++++++++++++ drivers/power/supply/rt9471.h | 76 ++ 5 files changed, 1123 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml create mode 100644 drivers/power/supply/rt9471.c create mode 100644 drivers/power/supply/rt9471.h -- 2.7.4 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-11 13:41 [PATCH 0/2] Add Richtek RT9471 3A battery charger support cy_huang @ 2022-08-11 13:41 ` cy_huang 2022-08-11 14:12 ` Krzysztof Kozlowski 2022-08-12 15:13 ` Rob Herring 2022-08-11 13:41 ` [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver cy_huang 1 sibling, 2 replies; 16+ messages in thread From: cy_huang @ 2022-08-11 13:41 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, sre Cc: alina_yu, cy_huang, alinayu829, linux-pm, devicetree, linux-kernel From: ChiYuan Huang <cy_huang@richtek.com> Add bindings for the Richtek RT9471 I2C controlled battery charger. Co-developed-by: Alina Yu <alina_yu@richtek.com> Signed-off-by: Alina Yu <alina_yu@richtek.com> Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> --- .../bindings/power/supply/richtek,rt9471.yaml | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml diff --git a/Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml b/Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml new file mode 100644 index 00000000..6fef1bd --- /dev/null +++ b/Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/power/supply/richtek,rt9471.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Richtek RT9471 3A Single Cell Switching Battery charger + +maintainers: + - Alina Yu <alina_yu@richtek.com> + - ChiYuan Huang <cy_huang@richtek.com> + +description: | + RT9471 is a switch-mode single cell Li-Ion/Li-Polymer battery charger for + portable applications. It supports USB BC1.2 port detection, current and + voltage regulations in both charging and boost mode. + + Datasheet is available at + https://www.richtek.com/assets/product_file/RT9471=RT9471D/DS9471D-02.pdf + +properties: + compatible: + const: richtek,rt9471 + + reg: + maxItems: 1 + + ceb-gpios: + maxItems: 1 + + wakeup-source: true + + interrupts: + maxItems: 1 + + interrupt-controller: true + + "#interrupt-cells": + const: 1 + + usb-otg-vbus-regulator: + type: object + unevaluatedProperties: false + $ref: /schemas/regulator/regulator.yaml# + +required: + - compatible + - reg + - wakeup-source + - interrupts + - interrupt-controller + - "#interrupt-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + + charger@53 { + compatible = "richtek,rt9471"; + reg = <0x53>; + ceb-gpios = <&gpio26 1 0>; + wakeup-source; + interrupts-extended = <&gpio1 32 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <1>; + + usb-otg-vbus-regulator { + regulator-compatible = "usb-otg-vbus"; + regulator-min-microvolt = <4850000>; + regulator-max-microvolt = <5300000>; + }; + }; + }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-11 13:41 ` [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger cy_huang @ 2022-08-11 14:12 ` Krzysztof Kozlowski 2022-08-12 1:32 ` ChiYuan Huang 2022-08-12 15:13 ` Rob Herring 1 sibling, 1 reply; 16+ messages in thread From: Krzysztof Kozlowski @ 2022-08-11 14:12 UTC (permalink / raw) To: cy_huang, robh+dt, krzysztof.kozlowski+dt, sre Cc: alina_yu, cy_huang, alinayu829, linux-pm, devicetree, linux-kernel On 11/08/2022 16:41, cy_huang wrote: > From: ChiYuan Huang <cy_huang@richtek.com> > > Add bindings for the Richtek RT9471 I2C controlled battery charger. > Thank you for your patch. There is something to discuss/improve. > +properties: > + compatible: > + const: richtek,rt9471 > + > + reg: > + maxItems: 1 > + > + ceb-gpios: > + maxItems: 1 This looks not standard, so please provide a description. > + > + wakeup-source: true > + > + interrupts: > + maxItems: 1 > + > + interrupt-controller: true > + > + "#interrupt-cells": > + const: 1 Why a charger driver is a interrupt-controller? > + > + usb-otg-vbus-regulator: > + type: object > + unevaluatedProperties: false > + $ref: /schemas/regulator/regulator.yaml# > + > +required: > + - compatible > + - reg > + - wakeup-source > + - interrupts > + - interrupt-controller > + - "#interrupt-cells" > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + i2c { > + #address-cells = <1>; > + #size-cells = <0>; > + > + charger@53 { > + compatible = "richtek,rt9471"; > + reg = <0x53>; > + ceb-gpios = <&gpio26 1 0>; Isn't the last value a GPIO flag? If yes, use appropriate define. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-11 14:12 ` Krzysztof Kozlowski @ 2022-08-12 1:32 ` ChiYuan Huang 2022-08-12 6:54 ` Krzysztof Kozlowski 0 siblings, 1 reply; 16+ messages in thread From: ChiYuan Huang @ 2022-08-12 1:32 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, cy_huang, alinayu829, Linux PM, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 於 2022年8月11日 週四 晚上10:12寫道： > > On 11/08/2022 16:41, cy_huang wrote: > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > Add bindings for the Richtek RT9471 I2C controlled battery charger. > > > > Thank you for your patch. There is something to discuss/improve. > > > +properties: > > + compatible: > > + const: richtek,rt9471 > > + > > + reg: > > + maxItems: 1 > > + > > + ceb-gpios: > > + maxItems: 1 > > This looks not standard, so please provide a description. It's the external 'charge enable' pin that's used to control battery charging. The priority is higher than the register 'CHG_EN' control. In the word, 'b' means it's reverse logic, low to allow charging, high to force disable charging. description: External charge enable pin that can force control not to charge the battery. Low to allow charging, high to disable charging. > > > + > > + wakeup-source: true > > + > > + interrupts: > > + maxItems: 1 > > + > > + interrupt-controller: true > > + > > + "#interrupt-cells": > > + const: 1 > > Why a charger driver is a interrupt-controller? There're 32 nested IRQs from RT9471. The original thought is to make the user easy to bind the interrupt into their driver. For charger driver, does it mean legacy IRQ handler is more preferred? > > > + > > + usb-otg-vbus-regulator: > > + type: object > > + unevaluatedProperties: false > > + $ref: /schemas/regulator/regulator.yaml# > > + > > +required: > > + - compatible > > + - reg > > + - wakeup-source > > + - interrupts > > + - interrupt-controller > > + - "#interrupt-cells" > > + > > +additionalProperties: false > > + > > +examples: > > + - | > > + #include <dt-bindings/interrupt-controller/irq.h> > > + i2c { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + > > + charger@53 { > > + compatible = "richtek,rt9471"; > > + reg = <0x53>; > > + ceb-gpios = <&gpio26 1 0>; > > Isn't the last value a GPIO flag? If yes, use appropriate define. I already specify GPIOD_OUT_LOW in the gpiod_request flag. Do I need to convert the gpio request code to GPIOD_OUT_HIGH, and specify here as GPIO_ACTIVE_LOW? > > > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-12 1:32 ` ChiYuan Huang @ 2022-08-12 6:54 ` Krzysztof Kozlowski 2022-08-12 15:57 ` ChiYuan Huang 0 siblings, 1 reply; 16+ messages in thread From: Krzysztof Kozlowski @ 2022-08-12 6:54 UTC (permalink / raw) To: ChiYuan Huang Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, cy_huang, alinayu829, Linux PM, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml On 12/08/2022 04:32, ChiYuan Huang wrote: > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 於 2022年8月11日 週四 晚上10:12寫道： >> >> On 11/08/2022 16:41, cy_huang wrote: >>> From: ChiYuan Huang <cy_huang@richtek.com> >>> >>> Add bindings for the Richtek RT9471 I2C controlled battery charger. >>> >> >> Thank you for your patch. There is something to discuss/improve. >> >>> +properties: >>> + compatible: >>> + const: richtek,rt9471 >>> + >>> + reg: >>> + maxItems: 1 >>> + >>> + ceb-gpios: >>> + maxItems: 1 >> >> This looks not standard, so please provide a description. > It's the external 'charge enable' pin that's used to control battery charging. > The priority is higher than the register 'CHG_EN' control. > In the word, 'b' means it's reverse logic, low to allow charging, high > to force disable charging. Isn't this standard enable-gpios property? > > description: > External charge enable pin that can force control not to charge the battery. > Low to allow charging, high to disable charging. > >> >>> + >>> + wakeup-source: true >>> + >>> + interrupts: >>> + maxItems: 1 >>> + >>> + interrupt-controller: true >>> + >>> + "#interrupt-cells": >>> + const: 1 >> >> Why a charger driver is a interrupt-controller? > There're 32 nested IRQs from RT9471. > The original thought is to make the user easy to bind the interrupt > into their driver. Bindings are not related to the driver but to hardware... > > For charger driver, does it mean legacy IRQ handler is more preferred? Who is the consumer of these interrupts? Can you show the DTS with the interrupt consumer? >> >>> + >>> + usb-otg-vbus-regulator: >>> + type: object >>> + unevaluatedProperties: false >>> + $ref: /schemas/regulator/regulator.yaml# >>> + >>> +required: >>> + - compatible >>> + - reg >>> + - wakeup-source >>> + - interrupts >>> + - interrupt-controller >>> + - "#interrupt-cells" >>> + >>> +additionalProperties: false >>> + >>> +examples: >>> + - | >>> + #include <dt-bindings/interrupt-controller/irq.h> >>> + i2c { >>> + #address-cells = <1>; >>> + #size-cells = <0>; >>> + >>> + charger@53 { >>> + compatible = "richtek,rt9471"; >>> + reg = <0x53>; >>> + ceb-gpios = <&gpio26 1 0>; >> >> Isn't the last value a GPIO flag? If yes, use appropriate define. > I already specify GPIOD_OUT_LOW in the gpiod_request flag. It is not related to the DTS. Anyway writing "low" for a meaning of high is not correct usually... > Do I need to convert the gpio request code to GPIOD_OUT_HIGH, > and specify here as GPIO_ACTIVE_LOW? You need to properly describe the hardware. The polarity of logical signal is defined by DTS, not by driver. It does not make sense to do it in driver. What if on some board the signal is inverted? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-12 6:54 ` Krzysztof Kozlowski @ 2022-08-12 15:57 ` ChiYuan Huang 2022-08-12 16:05 ` ChiYuan Huang 0 siblings, 1 reply; 16+ messages in thread From: ChiYuan Huang @ 2022-08-12 15:57 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, cy_huang, alinayu829, Linux PM, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 於 2022年8月12日 週五 下午2:54寫道： > > On 12/08/2022 04:32, ChiYuan Huang wrote: > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 於 2022年8月11日 週四 晚上10:12寫道： > >> > >> On 11/08/2022 16:41, cy_huang wrote: > >>> From: ChiYuan Huang <cy_huang@richtek.com> > >>> > >>> Add bindings for the Richtek RT9471 I2C controlled battery charger. > >>> > >> > >> Thank you for your patch. There is something to discuss/improve. > >> > >>> +properties: > >>> + compatible: > >>> + const: richtek,rt9471 > >>> + > >>> + reg: > >>> + maxItems: 1 > >>> + > >>> + ceb-gpios: > >>> + maxItems: 1 > >> > >> This looks not standard, so please provide a description. > > It's the external 'charge enable' pin that's used to control battery charging. > > The priority is higher than the register 'CHG_EN' control. > > In the word, 'b' means it's reverse logic, low to allow charging, high > > to force disable charging. > > Isn't this standard enable-gpios property? Not the same thing, this charger includes power patch control. This gpio is used to 'force disable' charge the battery. > > > > > description: > > External charge enable pin that can force control not to charge the battery. > > Low to allow charging, high to disable charging. > > > >> > >>> + > >>> + wakeup-source: true > >>> + > >>> + interrupts: > >>> + maxItems: 1 > >>> + > >>> + interrupt-controller: true > >>> + > >>> + "#interrupt-cells": > >>> + const: 1 > >> > >> Why a charger driver is a interrupt-controller? > > There're 32 nested IRQs from RT9471. > > The original thought is to make the user easy to bind the interrupt > > into their driver. > > Bindings are not related to the driver but to hardware... > Sorry, I mislead your comment. Refer to bq2515x.yaml, I think it's better to change this property to 'charge-enable-gpios'. It's the same usage like as TI charger. > > > > For charger driver, does it mean legacy IRQ handler is more preferred? > > Who is the consumer of these interrupts? Can you show the DTS with the > interrupt consumer? > > >> > >>> + > >>> + usb-otg-vbus-regulator: > >>> + type: object > >>> + unevaluatedProperties: false > >>> + $ref: /schemas/regulator/regulator.yaml# > >>> + > >>> +required: > >>> + - compatible > >>> + - reg > >>> + - wakeup-source > >>> + - interrupts > >>> + - interrupt-controller > >>> + - "#interrupt-cells" > >>> + > >>> +additionalProperties: false > >>> + > >>> +examples: > >>> + - | > >>> + #include <dt-bindings/interrupt-controller/irq.h> > >>> + i2c { > >>> + #address-cells = <1>; > >>> + #size-cells = <0>; > >>> + > >>> + charger@53 { > >>> + compatible = "richtek,rt9471"; > >>> + reg = <0x53>; > >>> + ceb-gpios = <&gpio26 1 0>; > >> > >> Isn't the last value a GPIO flag? If yes, use appropriate define. > > I already specify GPIOD_OUT_LOW in the gpiod_request flag. > > It is not related to the DTS. Anyway writing "low" for a meaning of high > is not correct usually... > > > Do I need to convert the gpio request code to GPIOD_OUT_HIGH, > > and specify here as GPIO_ACTIVE_LOW? > > You need to properly describe the hardware. The polarity of logical > signal is defined by DTS, not by driver. It does not make sense to do it > in driver. What if on some board the signal is inverted? > From our discussion, binding example just keep the active level that the pin is. So 'GPIO_ACTIVE_LOW', thanks. All of the above will be fixed in the next revision. > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-12 15:57 ` ChiYuan Huang @ 2022-08-12 16:05 ` ChiYuan Huang 2022-08-12 18:53 ` Krzysztof Kozlowski 0 siblings, 1 reply; 16+ messages in thread From: ChiYuan Huang @ 2022-08-12 16:05 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, cy_huang, alinayu829, Linux PM, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml ChiYuan Huang <u0084500@gmail.com> 於 2022年8月12日 週五 晚上11:57寫道： > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 於 2022年8月12日 週五 下午2:54寫道： > > > > On 12/08/2022 04:32, ChiYuan Huang wrote: > > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 於 2022年8月11日 週四 晚上10:12寫道： > > >> > > >> On 11/08/2022 16:41, cy_huang wrote: > > >>> From: ChiYuan Huang <cy_huang@richtek.com> > > >>> > > >>> Add bindings for the Richtek RT9471 I2C controlled battery charger. > > >>> > > >> > > >> Thank you for your patch. There is something to discuss/improve. > > >> > > >>> +properties: > > >>> + compatible: > > >>> + const: richtek,rt9471 > > >>> + > > >>> + reg: > > >>> + maxItems: 1 > > >>> + > > >>> + ceb-gpios: > > >>> + maxItems: 1 > > >> > > >> This looks not standard, so please provide a description. > > > It's the external 'charge enable' pin that's used to control battery charging. > > > The priority is higher than the register 'CHG_EN' control. > > > In the word, 'b' means it's reverse logic, low to allow charging, high > > > to force disable charging. > > > > Isn't this standard enable-gpios property? > Not the same thing, this charger includes power patch control. > This gpio is used to 'force disable' charge the battery. > > > > > > > > description: > > > External charge enable pin that can force control not to charge the battery. > > > Low to allow charging, high to disable charging. > > > > > >> > > >>> + > > >>> + wakeup-source: true > > >>> + > > >>> + interrupts: > > >>> + maxItems: 1 > > >>> + > > >>> + interrupt-controller: true > > >>> + > > >>> + "#interrupt-cells": > > >>> + const: 1 > > >> > > >> Why a charger driver is a interrupt-controller? > > > There're 32 nested IRQs from RT9471. > > > The original thought is to make the user easy to bind the interrupt > > > into their driver. > > > > Bindings are not related to the driver but to hardware... > > > Sorry, I mislead your comment. > Refer to bq2515x.yaml, I think it's better to change this property to > 'charge-enable-gpios'. > It's the same usage like as TI charger. > > > > > > For charger driver, does it mean legacy IRQ handler is more preferred? > > > > Who is the consumer of these interrupts? Can you show the DTS with the > > interrupt consumer? > > Sorry, I forget to reply this question. Some battery driver may need to know the 'full', 'recharge' , 'ieoc' status. The usage will be like as below battery { interrupts-extended = <&rt9471_chg 2 0>, <&rt9471_chg 3 0>, &(rt9471_chg 5 0>; interrupt-names = "chg-done", "chg-recharge", "chg-ieoc"; }; Some gauge HW needs this information to enhance the battery capacity accuracy. > > >> > > >>> + > > >>> + usb-otg-vbus-regulator: > > >>> + type: object > > >>> + unevaluatedProperties: false > > >>> + $ref: /schemas/regulator/regulator.yaml# > > >>> + > > >>> +required: > > >>> + - compatible > > >>> + - reg > > >>> + - wakeup-source > > >>> + - interrupts > > >>> + - interrupt-controller > > >>> + - "#interrupt-cells" > > >>> + > > >>> +additionalProperties: false > > >>> + > > >>> +examples: > > >>> + - | > > >>> + #include <dt-bindings/interrupt-controller/irq.h> > > >>> + i2c { > > >>> + #address-cells = <1>; > > >>> + #size-cells = <0>; > > >>> + > > >>> + charger@53 { > > >>> + compatible = "richtek,rt9471"; > > >>> + reg = <0x53>; > > >>> + ceb-gpios = <&gpio26 1 0>; > > >> > > >> Isn't the last value a GPIO flag? If yes, use appropriate define. > > > I already specify GPIOD_OUT_LOW in the gpiod_request flag. > > > > It is not related to the DTS. Anyway writing "low" for a meaning of high > > is not correct usually... > > > > > Do I need to convert the gpio request code to GPIOD_OUT_HIGH, > > > and specify here as GPIO_ACTIVE_LOW? > > > > You need to properly describe the hardware. The polarity of logical > > signal is defined by DTS, not by driver. It does not make sense to do it > > in driver. What if on some board the signal is inverted? > > > From our discussion, binding example just keep the active level that the pin is. > So 'GPIO_ACTIVE_LOW', thanks. > > All of the above will be fixed in the next revision. > > > Best regards, > > Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-12 16:05 ` ChiYuan Huang @ 2022-08-12 18:53 ` Krzysztof Kozlowski 2022-08-13 14:52 ` ChiYuan Huang 0 siblings, 1 reply; 16+ messages in thread From: Krzysztof Kozlowski @ 2022-08-12 18:53 UTC (permalink / raw) To: ChiYuan Huang Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, cy_huang, alinayu829, Linux PM, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml On 12/08/2022 19:05, ChiYuan Huang wrote: >> It's the same usage like as TI charger. >>>> >>>> For charger driver, does it mean legacy IRQ handler is more preferred? >>> >>> Who is the consumer of these interrupts? Can you show the DTS with the >>> interrupt consumer? >>> > Sorry, I forget to reply this question. > Some battery driver may need to know the 'full', 'recharge' , 'ieoc' status. > The usage will be like as below > > battery { > interrupts-extended = <&rt9471_chg 2 0>, <&rt9471_chg 3 0>, &(rt9471_chg 5 0>; > interrupt-names = "chg-done", "chg-recharge", "chg-ieoc"; > }; > > Some gauge HW needs this information to enhance the battery capacity accuracy. Other supply stack pieces do it via supplies (supplied to/from in include/linux/power_supply.h) and reporting power_supply_changed(). With such explanation, your device is an interrupt source, but it is not an interrupt controller. If your device is interrupt controller, it means someone routes the interrupt line to your device. Physical line. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-12 18:53 ` Krzysztof Kozlowski @ 2022-08-13 14:52 ` ChiYuan Huang 2022-08-16 7:27 ` Krzysztof Kozlowski 0 siblings, 1 reply; 16+ messages in thread From: ChiYuan Huang @ 2022-08-13 14:52 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, cy_huang, alinayu829, Linux PM, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 於 2022年8月13日 週六 凌晨2:53寫道： > > On 12/08/2022 19:05, ChiYuan Huang wrote: > >> It's the same usage like as TI charger. > >>>> > >>>> For charger driver, does it mean legacy IRQ handler is more preferred? > >>> > >>> Who is the consumer of these interrupts? Can you show the DTS with the > >>> interrupt consumer? > >>> > > Sorry, I forget to reply this question. > > Some battery driver may need to know the 'full', 'recharge' , 'ieoc' status. > > The usage will be like as below > > > > battery { > > interrupts-extended = <&rt9471_chg 2 0>, <&rt9471_chg 3 0>, &(rt9471_chg 5 0>; > > interrupt-names = "chg-done", "chg-recharge", "chg-ieoc"; > > }; > > > > Some gauge HW needs this information to enhance the battery capacity accuracy. > > Other supply stack pieces do it via supplies (supplied to/from in > include/linux/power_supply.h) and reporting power_supply_changed(). > > With such explanation, your device is an interrupt source, but it is not > an interrupt controller. If your device is interrupt controller, it > means someone routes the interrupt line to your device. Physical line. > Yap, sure. And so on, just use the SW power supply chain to do this kind of event notification. To remove it, it doesn't affect the internal interrupt request inside the driver. Just cannot be used for the outer driver to request the events directly. If so, I think 'interrupt-controller' and even '#interrupt-cells' need to be removed. OK? > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-13 14:52 ` ChiYuan Huang @ 2022-08-16 7:27 ` Krzysztof Kozlowski 0 siblings, 0 replies; 16+ messages in thread From: Krzysztof Kozlowski @ 2022-08-16 7:27 UTC (permalink / raw) To: ChiYuan Huang Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, cy_huang, alinayu829, Linux PM, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, lkml On 13/08/2022 17:52, ChiYuan Huang wrote: >>> Some gauge HW needs this information to enhance the battery capacity accuracy. >> >> Other supply stack pieces do it via supplies (supplied to/from in >> include/linux/power_supply.h) and reporting power_supply_changed(). >> >> With such explanation, your device is an interrupt source, but it is not >> an interrupt controller. If your device is interrupt controller, it >> means someone routes the interrupt line to your device. Physical line. >> > Yap, sure. And so on, just use the SW power supply chain to do this > kind of event notification. > To remove it, it doesn't affect the internal interrupt request inside > the driver. > Just cannot be used for the outer driver to request the events directly. > > If so, I think 'interrupt-controller' and even '#interrupt-cells' need > to be removed. > OK? Yes, both should be removed. Your device is not an interrupt controller... Best regards, Krzysztof ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-11 13:41 ` [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger cy_huang 2022-08-11 14:12 ` Krzysztof Kozlowski @ 2022-08-12 15:13 ` Rob Herring 2022-08-12 16:07 ` ChiYuan Huang 1 sibling, 1 reply; 16+ messages in thread From: Rob Herring @ 2022-08-12 15:13 UTC (permalink / raw) To: cy_huang Cc: krzysztof.kozlowski+dt, linux-kernel, alina_yu, sre, devicetree, alinayu829, robh+dt, linux-pm, cy_huang On Thu, 11 Aug 2022 21:41:57 +0800, cy_huang wrote: > From: ChiYuan Huang <cy_huang@richtek.com> > > Add bindings for the Richtek RT9471 I2C controlled battery charger. > > Co-developed-by: Alina Yu <alina_yu@richtek.com> > Signed-off-by: Alina Yu <alina_yu@richtek.com> > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > --- > .../bindings/power/supply/richtek,rt9471.yaml | 78 ++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/power/supply/richtek,rt9471.example.dtb: charger@53: usb-otg-vbus-regulator: Unevaluated properties are not allowed ('regulator-compatible' was unexpected) From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/ This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger 2022-08-12 15:13 ` Rob Herring @ 2022-08-12 16:07 ` ChiYuan Huang 0 siblings, 0 replies; 16+ messages in thread From: ChiYuan Huang @ 2022-08-12 16:07 UTC (permalink / raw) To: Rob Herring Cc: Krzysztof Kozlowski, lkml, 游子馨, Sebastian Reichel, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, alinayu829, Rob Herring, Linux PM, cy_huang Rob Herring <robh@kernel.org> 於 2022年8月12日 週五 晚上11:13寫道： > > On Thu, 11 Aug 2022 21:41:57 +0800, cy_huang wrote: > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > Add bindings for the Richtek RT9471 I2C controlled battery charger. > > > > Co-developed-by: Alina Yu <alina_yu@richtek.com> > > Signed-off-by: Alina Yu <alina_yu@richtek.com> > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > > --- > > .../bindings/power/supply/richtek,rt9471.yaml | 78 ++++++++++++++++++++++ > > 1 file changed, 78 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml > > > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/power/supply/richtek,rt9471.example.dtb: charger@53: usb-otg-vbus-regulator: Unevaluated properties are not allowed ('regulator-compatible' was unexpected) > From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml > > doc reference errors (make refcheckdocs): > > See https://patchwork.ozlabs.org/patch/ > Thanks, after I add 'DT_CHECKER_FLAGS=-m', it also can be found for this error. This is typo, not 'regulator-compatible', it's 'regulator-name'. Will be fixed in next revision. > This check can fail if there are any dependencies. The base for a patch > series is generally the most recent rc1. > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure 'yamllint' is installed and dt-schema is up to > date: > > pip3 install dtschema --upgrade > > Please check and re-submit. > ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver 2022-08-11 13:41 [PATCH 0/2] Add Richtek RT9471 3A battery charger support cy_huang 2022-08-11 13:41 ` [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger cy_huang @ 2022-08-11 13:41 ` cy_huang 2022-08-15 5:53 ` Matti Vaittinen 1 sibling, 1 reply; 16+ messages in thread From: cy_huang @ 2022-08-11 13:41 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, sre Cc: alina_yu, cy_huang, alinayu829, linux-pm, devicetree, linux-kernel From: ChiYuan Huang <cy_huang@richtek.com> Add support for the RT9471 3A 1-Cell Li+ battery charger. The RT9471 is a highly-integrated 3A switch mode battery charger with low impedance power path to better optimize the charging efficiency. Co-developed-by: Alina Yu <alina_yu@richtek.com> Signed-off-by: Alina Yu <alina_yu@richtek.com> Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> --- drivers/power/supply/Kconfig | 16 + drivers/power/supply/Makefile | 1 + drivers/power/supply/rt9471.c | 952 ++++++++++++++++++++++++++++++++++++++++++ drivers/power/supply/rt9471.h | 76 ++++ 4 files changed, 1045 insertions(+) create mode 100644 drivers/power/supply/rt9471.c create mode 100644 drivers/power/supply/rt9471.h diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 1aa8323..e9b61c2 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -772,6 +772,22 @@ config CHARGER_RT9455 help Say Y to enable support for Richtek RT9455 battery charger. +config CHARGER_RT9471 + tristate "Richtek RT9471 battery charger driver" + depends on I2C && GPIOLIB && REGULATOR + select REGMAP_I2C + select REGMAP_IRQ + select LINEAR_RANGES + help + This adds support for Richtek RT9471 battery charger. RT9471 is + highly-integrated switch mode battery charger which is system power + patch manageable device for single cell Li-Ion and Li-polymer battery. + It can support BC12 detection on DPDM, and current and voltage + regulation on both charging and boost mode. + + This driver can also be built as a module. If so, the module will be + called rt9471. + config CHARGER_CROS_USBPD tristate "ChromeOS EC based USBPD charger" depends on CROS_USBPD_NOTIFY diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 7f02f36..17c8c1a 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -57,6 +57,7 @@ obj-$(CONFIG_BATTERY_MAX1721X) += max1721x_battery.o obj-$(CONFIG_BATTERY_Z2) += z2_battery.o obj-$(CONFIG_BATTERY_RT5033) += rt5033_battery.o obj-$(CONFIG_CHARGER_RT9455) += rt9455_charger.o +obj-$(CONFIG_CHARGER_RT9471) += rt9471.o obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o obj-$(CONFIG_BATTERY_TWL4030_MADC) += twl4030_madc_battery.o obj-$(CONFIG_CHARGER_88PM860X) += 88pm860x_charger.o diff --git a/drivers/power/supply/rt9471.c b/drivers/power/supply/rt9471.c new file mode 100644 index 00000000..cfd801d --- /dev/null +++ b/drivers/power/supply/rt9471.c @@ -0,0 +1,952 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2022 Richtek Technology Corp. + * + * Authors: Alina Yu <alina_yu@richtek.com> + * ChiYuan Huang <cy_huang@richtek.com> + */ + +#include <linux/bits.h> +#include <linux/gpio/consumer.h> +#include <linux/i2c.h> +#include <linux/interrupt.h> +#include <linux/kstrtox.h> +#include <linux/linear_range.h> +#include <linux/mod_devicetable.h> +#include <linux/mutex.h> +#include <linux/of.h> +#include <linux/power_supply.h> +#include <linux/regmap.h> +#include <linux/regulator/driver.h> +#include <linux/sysfs.h> + +#include "rt9471.h" + +enum rt9471_fields { + F_WDT = 0, + F_WDT_RST, + F_CHG_EN, + F_HZ, + F_BATFET_DIS, + F_AICR, + F_AICC_EN, + F_MIVR, + F_IPRE_CHG, + F_VPRE_CHG, + F_VBAT_REG, + F_ICHG_REG, + F_EOC_RST, + F_TE, + F_IEOC_CHG, + F_DEVICE_ID, + F_REG_RST, + F_BC12_EN, + F_IC_STAT, + F_PORT_STAT, + F_ST_CHG_DONE, + F_ST_CHG_RDY, + F_ST_VBUS_GD, + F_MAX_FIELDS +}; + +enum rt9471_ranges { + RT9471_RANGE_AICR = 0, + RT9471_RANGE_MIVR, + RT9471_RANGE_IPRE, + RT9471_RANGE_VCHG, + RT9471_RANGE_ICHG, + RT9471_RANGE_IEOC, + RT9471_MAX_RANGES +}; + +enum { + RT9471_PORTSTAT_APPLE_10W = 8, + RT9471_PORTSTAT_SAMSUNG_10W, + RT9471_PORTSTAT_APPLE_5W, + RT9471_PORTSTAT_APPLE_12W, + RT9471_PORTSTAT_NSTD, + RT9471_PORTSTAT_SDP, + RT9471_PORTSTAT_CDP, + RT9471_PORTSTAT_DCP, +}; + +struct rt9471_chip { + struct device *dev; + struct gpio_desc *ceb_gpio; + struct regmap *regmap; + struct regmap_field *rm_fields[F_MAX_FIELDS]; + struct regmap_irq_chip_data *irq_chip_data; + struct regulator_dev *otg_rdev; + struct power_supply *psy; + struct power_supply_desc psy_desc; + struct mutex var_lock; + enum power_supply_usb_type psy_usb_type; + int psy_usb_curr; +}; + +static const struct reg_field rt9471_reg_fields[F_MAX_FIELDS] = { + [F_WDT] = REG_FIELD(RT9471_REG_TOP, 0, 0), + [F_WDT_RST] = REG_FIELD(RT9471_REG_TOP, 1, 1), + [F_CHG_EN] = REG_FIELD(RT9471_REG_FUNC, 0, 0), + [F_HZ] = REG_FIELD(RT9471_REG_FUNC, 5, 5), + [F_BATFET_DIS] = REG_FIELD(RT9471_REG_FUNC, 7, 7), + [F_AICR] = REG_FIELD(RT9471_REG_IBUS, 0, 5), + [F_AICC_EN] = REG_FIELD(RT9471_REG_IBUS, 7, 7), + [F_MIVR] = REG_FIELD(RT9471_REG_VBUS, 0, 3), + [F_IPRE_CHG] = REG_FIELD(RT9471_REG_PRECHG, 0, 3), + [F_VPRE_CHG] = REG_FIELD(RT9471_REG_PRECHG, 4, 6), + [F_VBAT_REG] = REG_FIELD(RT9471_REG_VCHG, 0, 6), + [F_ICHG_REG] = REG_FIELD(RT9471_REG_ICHG, 0, 5), + [F_EOC_RST] = REG_FIELD(RT9471_REG_EOC, 0, 0), + [F_TE] = REG_FIELD(RT9471_REG_EOC, 1, 1), + [F_IEOC_CHG] = REG_FIELD(RT9471_REG_EOC, 4, 7), + [F_DEVICE_ID] = REG_FIELD(RT9471_REG_INFO, 3, 6), + [F_REG_RST] = REG_FIELD(RT9471_REG_INFO, 7, 7), + [F_BC12_EN] = REG_FIELD(RT9471_REG_DPDMDET, 7, 7), + [F_IC_STAT] = REG_FIELD(RT9471_REG_ICSTAT, 0, 3), + [F_PORT_STAT] = REG_FIELD(RT9471_REG_ICSTAT, 4, 7), + [F_ST_CHG_DONE] = REG_FIELD(RT9471_REG_STAT0, 3, 3), + [F_ST_CHG_RDY] = REG_FIELD(RT9471_REG_STAT0, 6, 6), + [F_ST_VBUS_GD] = REG_FIELD(RT9471_REG_STAT0, 7, 7), +}; + +static const struct linear_range rt9471_chg_ranges[RT9471_MAX_RANGES] = { + [RT9471_RANGE_AICR] = { 50000, 1, 63, 50000 }, + [RT9471_RANGE_MIVR] = { 3900000, 0, 15, 100000 }, + [RT9471_RANGE_IPRE] = { 50000, 0, 15, 50000 }, + [RT9471_RANGE_VCHG] = { 3900000, 0, 80, 10000 }, + [RT9471_RANGE_ICHG] = { 0, 0, 63, 50000 }, + [RT9471_RANGE_IEOC] = { 50000, 0, 15, 50000 }, +}; + +static int rt9471_set_value_by_field_range(struct rt9471_chip *chip, + enum rt9471_fields field, + enum rt9471_ranges range, int val) +{ + unsigned int sel; + + if (val < 0) + return -EINVAL; + + linear_range_get_selector_within(rt9471_chg_ranges + range, val, &sel); + + return regmap_field_write(chip->rm_fields[field], sel); +} + + +static int rt9471_get_value_by_field_range(struct rt9471_chip *chip, + enum rt9471_fields field, + enum rt9471_ranges range, int *val) +{ + unsigned int sel, rvalue; + int ret; + + ret = regmap_field_read(chip->rm_fields[field], &sel); + if (ret) + return ret; + + ret = linear_range_get_value(rt9471_chg_ranges + range, sel, &rvalue); + if (ret) + return ret; + + *val = rvalue; + return 0; +} + +static inline int rt9471_set_hiz(struct rt9471_chip *chip, int enable) +{ + return regmap_field_write(chip->rm_fields[F_HZ], enable); +} + +static inline int rt9471_set_ichg(struct rt9471_chip *chip, int microamp) +{ + return rt9471_set_value_by_field_range(chip, F_ICHG_REG, + RT9471_RANGE_ICHG, microamp); +} + +static inline int rt9471_get_ichg(struct rt9471_chip *chip, int *microamp) +{ + return rt9471_get_value_by_field_range(chip, F_ICHG_REG, + RT9471_RANGE_ICHG, microamp); +} + +static inline int rt9471_set_cv(struct rt9471_chip *chip, int microvolt) +{ + return rt9471_set_value_by_field_range(chip, F_VBAT_REG, + RT9471_RANGE_VCHG, microvolt); +} + +static inline int rt9471_get_cv(struct rt9471_chip *chip, int *microamp) +{ + return rt9471_get_value_by_field_range(chip, F_VBAT_REG, + RT9471_RANGE_VCHG, microamp); +} + +static inline int rt9471_set_mivr(struct rt9471_chip *chip, int microvolt) +{ + return rt9471_set_value_by_field_range(chip, F_MIVR, + RT9471_RANGE_MIVR, microvolt); +} + +static inline int rt9471_get_mivr(struct rt9471_chip *chip, int *microvolt) +{ + return rt9471_get_value_by_field_range(chip, F_MIVR, + RT9471_RANGE_MIVR, microvolt); +} + +static inline int rt9471_set_aicr(struct rt9471_chip *chip, int microamp) +{ + return rt9471_set_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, + microamp); +} + +static inline int rt9471_get_aicr(struct rt9471_chip *chip, int *microamp) +{ + return rt9471_get_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, + microamp); +} + +static inline int rt9471_set_iprechg(struct rt9471_chip *chip, int microamp) +{ + return rt9471_set_value_by_field_range(chip, F_IPRE_CHG, + RT9471_RANGE_IPRE, microamp); +} + +static inline int rt9471_get_iprechg(struct rt9471_chip *chip, int *microamp) +{ + return rt9471_get_value_by_field_range(chip, F_IPRE_CHG, + RT9471_RANGE_IPRE, microamp); +} + +static inline int rt9471_set_ieoc(struct rt9471_chip *chip, int microamp) +{ + return rt9471_set_value_by_field_range(chip, F_IEOC_CHG, + RT9471_RANGE_IEOC, microamp); +} + +static inline int rt9471_get_ieoc(struct rt9471_chip *chip, int *microamp) +{ + return rt9471_get_value_by_field_range(chip, F_IEOC_CHG, + RT9471_RANGE_IEOC, microamp); +} + +static inline int rt9471_set_chg_enable(struct rt9471_chip *chip, int enable) +{ + return regmap_field_write(chip->rm_fields[F_CHG_EN], !!enable); +} + +static int rt9471_get_status(struct rt9471_chip *chip, int *status) +{ + unsigned int chg_ready, chg_done, fault_stat; + int ret; + + ret = regmap_field_read(chip->rm_fields[F_ST_CHG_RDY], &chg_ready); + if (ret) + return ret; + + ret = regmap_field_read(chip->rm_fields[F_ST_CHG_DONE], &chg_done); + if (ret) + return ret; + + ret = regmap_read(chip->regmap, RT9471_REG_STAT1, &fault_stat); + if (ret) + return ret; + + fault_stat &= RT9471_CHGFAULT_MASK; + + if (chg_ready && chg_done) + *status = POWER_SUPPLY_STATUS_FULL; + else if (chg_ready && fault_stat) + *status = POWER_SUPPLY_STATUS_NOT_CHARGING; + else if (chg_ready && !fault_stat) + *status = POWER_SUPPLY_STATUS_CHARGING; + else + *status = POWER_SUPPLY_STATUS_DISCHARGING; + + return 0; +} + +static int rt9471_get_vbus_good(struct rt9471_chip *chip, int *stat) +{ + unsigned int vbus_gd; + int ret; + + ret = regmap_field_read(chip->rm_fields[F_ST_VBUS_GD], &vbus_gd); + if (ret) + return ret; + + *stat = vbus_gd; + return 0; +} + +static int rt9471_get_usb_type(struct rt9471_chip *chip, int *usb_type) +{ + mutex_lock(&chip->var_lock); + *usb_type = chip->psy_usb_type; + mutex_unlock(&chip->var_lock); + + return 0; +} + +static int rt9471_get_usb_type_current(struct rt9471_chip *chip, + int *microamp) +{ + mutex_lock(&chip->var_lock); + *microamp = chip->psy_usb_curr; + mutex_unlock(&chip->var_lock); + + return 0; +} + +static enum power_supply_property rt9471_charger_properties[] = { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_ONLINE, + POWER_SUPPLY_PROP_CURRENT_MAX, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, + POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, + POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT, + POWER_SUPPLY_PROP_USB_TYPE, + POWER_SUPPLY_PROP_PRECHARGE_CURRENT, + POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT, + POWER_SUPPLY_PROP_MODEL_NAME, + POWER_SUPPLY_PROP_MANUFACTURER, +}; + +static enum power_supply_usb_type rt9471_charger_usb_types[] = { + POWER_SUPPLY_USB_TYPE_UNKNOWN, + POWER_SUPPLY_USB_TYPE_SDP, + POWER_SUPPLY_USB_TYPE_DCP, + POWER_SUPPLY_USB_TYPE_CDP, + POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID, +}; + +static int rt9471_charger_property_is_writeable(struct power_supply *psy, + enum power_supply_property psp) +{ + switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + case POWER_SUPPLY_PROP_ONLINE: + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT: + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: + case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT: + case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT: + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT: + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT: + return 1; + default: + return 0; + } +} + +static int rt9471_charger_set_property(struct power_supply *psy, + enum power_supply_property psp, + const union power_supply_propval *val) +{ + struct rt9471_chip *chip = power_supply_get_drvdata(psy); + + switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + return rt9471_set_chg_enable(chip, val->intval); + case POWER_SUPPLY_PROP_ONLINE: + return rt9471_set_hiz(chip, !val->intval); + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT: + return rt9471_set_ichg(chip, val->intval); + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: + return rt9471_set_cv(chip, val->intval); + case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT: + return rt9471_set_aicr(chip, val->intval); + case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT: + return rt9471_set_mivr(chip, val->intval); + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT: + return rt9471_set_iprechg(chip, val->intval); + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT: + return rt9471_set_ieoc(chip, val->intval); + default: + return -EINVAL; + } +} + +static const char * const rt9471_manufacturer = "Richtek Technology Corp."; +static const char * const rt9471_model = "RT9471"; + +static int rt9471_charger_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct rt9471_chip *chip = power_supply_get_drvdata(psy); + + switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + return rt9471_get_status(chip, &val->intval); + case POWER_SUPPLY_PROP_ONLINE: + return rt9471_get_vbus_good(chip, &val->intval); + case POWER_SUPPLY_PROP_CURRENT_MAX: + return rt9471_get_usb_type_current(chip, &val->intval); + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT: + return rt9471_get_ichg(chip, &val->intval); + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: + val->intval = RT9471_ICHG_MAXUA; + return 0; + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: + return rt9471_get_cv(chip, &val->intval); + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX: + val->intval = RT9471_VCHG_MAXUV; + return 0; + case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT: + return rt9471_get_aicr(chip, &val->intval); + case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT: + return rt9471_get_mivr(chip, &val->intval); + case POWER_SUPPLY_PROP_USB_TYPE: + return rt9471_get_usb_type(chip, &val->intval); + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT: + return rt9471_get_iprechg(chip, &val->intval); + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT: + return rt9471_get_ieoc(chip, &val->intval); + case POWER_SUPPLY_PROP_MODEL_NAME: + val->strval = rt9471_model; + return 0; + case POWER_SUPPLY_PROP_MANUFACTURER: + val->strval = rt9471_manufacturer; + return 0; + default: + return -ENODATA; + } +} + +static irqreturn_t rt9471_vbus_gd_handler(int irqno, void *devid) +{ + struct rt9471_chip *chip = devid; + + power_supply_changed(chip->psy); + + return IRQ_HANDLED; +} + +static irqreturn_t rt9471_detach_handler(int irqno, void *devid) +{ + struct rt9471_chip *chip = devid; + unsigned int vbus_gd; + int ret; + + ret = regmap_field_read(chip->rm_fields[F_ST_VBUS_GD], &vbus_gd); + if (ret) + return IRQ_NONE; + + /* Only focus on really detached */ + if (vbus_gd) + return IRQ_HANDLED; + + mutex_lock(&chip->var_lock); + chip->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN; + chip->psy_usb_curr = 0; + mutex_unlock(&chip->var_lock); + + power_supply_changed(chip->psy); + + return IRQ_HANDLED; +} + +static irqreturn_t rt9471_bc12_done_handler(int irqno, void *devid) +{ + struct rt9471_chip *chip = devid; + enum power_supply_usb_type usb_type; + unsigned int port_stat; + int usb_curr, ret; + + ret = regmap_field_read(chip->rm_fields[F_PORT_STAT], &port_stat); + if (ret) + return IRQ_NONE; + + switch (port_stat) { + case RT9471_PORTSTAT_APPLE_10W: + usb_type = POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID; + usb_curr = 2000000; + break; + case RT9471_PORTSTAT_APPLE_5W: + usb_type = POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID; + usb_curr = 1000000; + break; + case RT9471_PORTSTAT_APPLE_12W: + usb_type = POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID; + usb_curr = 2400000; + break; + case RT9471_PORTSTAT_SAMSUNG_10W: + usb_type = POWER_SUPPLY_USB_TYPE_DCP; + usb_curr = 2000000; + break; + case RT9471_PORTSTAT_DCP: + usb_type = POWER_SUPPLY_USB_TYPE_DCP; + usb_curr = 1500000; + break; + case RT9471_PORTSTAT_NSTD: + case RT9471_PORTSTAT_SDP: + usb_type = POWER_SUPPLY_USB_TYPE_SDP; + usb_curr = 500000; + break; + case RT9471_PORTSTAT_CDP: + usb_type = POWER_SUPPLY_USB_TYPE_CDP; + usb_curr = 1500000; + break; + default: + usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN; + usb_curr = 0; + break; + } + + mutex_lock(&chip->var_lock); + chip->psy_usb_type = usb_type; + chip->psy_usb_curr = usb_curr; + mutex_unlock(&chip->var_lock); + + power_supply_changed(chip->psy); + + return IRQ_HANDLED; +} + +static irqreturn_t rt9471_wdt_handler(int irqno, void *devid) +{ + struct rt9471_chip *chip = devid; + int ret; + + ret = regmap_field_write(chip->rm_fields[F_WDT_RST], 1); + + return ret ? IRQ_NONE : IRQ_HANDLED; +} + +static irqreturn_t rt9471_otg_fault_handler(int irqno, void *devid) +{ + struct rt9471_chip *chip = devid; + + regulator_notifier_call_chain(chip->otg_rdev, REGULATOR_EVENT_FAIL, NULL); + + return IRQ_HANDLED; +} + +#define RT9471_IRQ_DESC(_name, _hwirq) \ +{ \ + .name = #_name, \ + .hwirq = _hwirq, \ + .handler = rt9471_##_name##_handler, \ +} + +static int rt9471_register_interrupts(struct rt9471_chip *chip) +{ + struct device *dev = chip->dev; + static const struct { + char *name; + int hwirq; + irq_handler_t handler; + } chg_irqs[] = { + RT9471_IRQ_DESC(vbus_gd, RT9471_IRQ_VBUS_GD), + RT9471_IRQ_DESC(detach, RT9471_IRQ_DETACH), + RT9471_IRQ_DESC(bc12_done, RT9471_IRQ_BC12_DONE), + RT9471_IRQ_DESC(wdt, RT9471_IRQ_WDT), + RT9471_IRQ_DESC(otg_fault, RT9471_IRQ_OTG_FAULT), + }, *curr; + int i, virq, ret; + + for (i = 0; i < ARRAY_SIZE(chg_irqs); i++) { + curr = chg_irqs + i; + + virq = regmap_irq_get_virq(chip->irq_chip_data, curr->hwirq); + if (virq <= 0) + return virq; + + ret = devm_request_threaded_irq(dev, virq, NULL, curr->handler, + IRQF_ONESHOT, curr->name, chip); + if (ret) + return dev_err_probe(dev, ret, "Failed to register IRQ (%s)\n", + curr->name); + } + + return 0; +} + +static const struct regulator_ops rt9471_otg_ops = { + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .list_voltage = regulator_list_voltage_linear, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .set_current_limit = regulator_set_current_limit_regmap, + .get_current_limit = regulator_get_current_limit_regmap, +}; + +static const unsigned int rt9471_otg_microamp[] = { 500000, 1200000, }; + +static const struct regulator_desc rt9471_otg_rdesc = { + .of_match = of_match_ptr("usb-otg-vbus-regulator"), + .name = "rt9471-otg-vbus", + .owner = THIS_MODULE, + .type = REGULATOR_VOLTAGE, + .ops = &rt9471_otg_ops, + .min_uV = RT9471_OTGCV_MINUV, + .uV_step = RT9471_OTGCV_STEPUV, + .n_voltages = RT9471_NUM_VOTG, + .curr_table = rt9471_otg_microamp, + .n_current_limits = ARRAY_SIZE(rt9471_otg_microamp), + .enable_mask = RT9471_OTGEN_MASK, + .enable_reg = RT9471_REG_FUNC, + .vsel_reg = RT9471_REG_OTGCFG, + .vsel_mask = RT9471_OTGCV_MASK, + .csel_reg = RT9471_REG_OTGCFG, + .csel_mask = RT9471_OTGCC_MASK, +}; + +static int rt9471_register_otg_regulator(struct rt9471_chip *chip) +{ + struct device *dev = chip->dev; + struct regulator_config cfg = { .dev = dev, .driver_data = chip }; + + chip->otg_rdev = devm_regulator_register(dev, &rt9471_otg_rdesc, &cfg); + + return PTR_ERR_OR_ZERO(chip->otg_rdev); +} + +static inline struct rt9471_chip * psy_device_to_chip(struct device *dev) +{ + return power_supply_get_drvdata(to_power_supply(dev)); +} + +static ssize_t sysoff_enable_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct rt9471_chip *chip = psy_device_to_chip(dev); + unsigned int sysoff_enable; + int ret; + + ret = regmap_field_read(chip->rm_fields[F_BATFET_DIS], &sysoff_enable); + if (ret) + return ret; + + return sysfs_emit(buf, "%d\n", sysoff_enable); +} + +static ssize_t sysoff_enable_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct rt9471_chip *chip = psy_device_to_chip(dev); + unsigned int tmp; + int ret; + + ret = kstrtouint(buf, 10, &tmp); + if (ret) + return ret; + + ret = regmap_field_write(chip->rm_fields[F_BATFET_DIS], !!tmp); + if (ret) + return ret; + + return count; +} + +static ssize_t charge_term_enable_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct rt9471_chip *chip = psy_device_to_chip(dev); + unsigned int chg_term; + int ret; + + ret = regmap_field_read(chip->rm_fields[F_TE], &chg_term); + if (ret) + return ret; + + return sysfs_emit(buf, "%d\n", chg_term); +} + +static ssize_t charge_term_enable_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct rt9471_chip *chip = psy_device_to_chip(dev); + unsigned int tmp; + int ret; + + ret = kstrtouint(buf, 10, &tmp); + if (ret) + return ret; + + ret = regmap_field_write(chip->rm_fields[F_TE], !!tmp); + if (ret) + return ret; + + return count; +} + +static ssize_t port_detect_enable_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct rt9471_chip *chip = psy_device_to_chip(dev); + unsigned int bc12_enable; + int ret; + + ret = regmap_field_read(chip->rm_fields[F_BC12_EN], &bc12_enable); + if (ret) + return ret; + + return sysfs_emit(buf, "%d\n", bc12_enable); +} + +static ssize_t port_detect_enable_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct rt9471_chip *chip = psy_device_to_chip(dev); + unsigned int tmp; + int ret; + + ret = kstrtouint(buf, 10, &tmp); + if (ret) + return ret; + + ret = regmap_field_write(chip->rm_fields[F_BC12_EN], !!tmp); + if (ret) + return ret; + + return count; +} + +static DEVICE_ATTR_RW(sysoff_enable); +static DEVICE_ATTR_RW(charge_term_enable); +static DEVICE_ATTR_RW(port_detect_enable); + +static struct attribute *rt9471_sysfs_entries[] = { + &dev_attr_sysoff_enable.attr, + &dev_attr_charge_term_enable.attr, + &dev_attr_port_detect_enable.attr, + NULL +}; + +static const struct attribute_group rt9471_attr_group = { + .attrs = rt9471_sysfs_entries, +}; + +static const struct attribute_group *rt9471_attr_groups[] = { + &rt9471_attr_group, + NULL +}; + +static int rt9471_register_psy(struct rt9471_chip *chip) +{ + struct device *dev = chip->dev; + struct power_supply_desc *desc = &chip->psy_desc; + struct power_supply_config cfg = {}; + char *psy_name; + + cfg.drv_data = chip; + cfg.of_node = dev->of_node; + cfg.attr_grp = rt9471_attr_groups; + + psy_name = devm_kasprintf(dev, GFP_KERNEL, "rt9471-%s", dev_name(dev)); + if (!psy_name) + return -ENOMEM; + + desc->name = psy_name; + desc->type = POWER_SUPPLY_TYPE_USB; + desc->usb_types = rt9471_charger_usb_types; + desc->num_usb_types = ARRAY_SIZE(rt9471_charger_usb_types); + desc->properties = rt9471_charger_properties; + desc->num_properties = ARRAY_SIZE(rt9471_charger_properties); + desc->get_property = rt9471_charger_get_property; + desc->set_property = rt9471_charger_set_property; + desc->property_is_writeable = rt9471_charger_property_is_writeable; + + chip->psy = devm_power_supply_register(dev, desc, &cfg); + + return PTR_ERR_OR_ZERO(chip->psy); +} + +static const struct regmap_irq rt9471_regmap_irqs[] = { + REGMAP_IRQ_REG_LINE(RT9471_IRQ_BC12_DONE, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_DETACH, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_RECHG, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_DONE, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_BG_CHG, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_IE0C, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_RDY, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_VBUS_GD, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_BATOV, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_SYSOV, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_TOUT, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_BUSUV, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_THREG, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_AICR, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_CHG_MIVR, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_SYS_SHORT, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_SYS_MIN, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_AICC_DONE, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_PE_DONE, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_JEITA_COLD, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_JEITA_COOL, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_JEITA_WARM, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_JEITA_HOT, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_OTG_FAULT, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_OTG_LBP, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_OTG_CC, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_WDT, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_VAC_OV, 8), + REGMAP_IRQ_REG_LINE(RT9471_IRQ_OTP, 8), +}; + +static const struct regmap_irq_chip rt9471_irq_chip = { + .name = "rt9471-irqs", + .status_base = RT9471_REG_IRQ0, + .mask_base = RT9471_REG_MASK0, + .num_regs = RT9471_NUM_IRQ_REGS, + .irqs = rt9471_regmap_irqs, + .num_irqs = ARRAY_SIZE(rt9471_regmap_irqs), +}; + +static const struct reg_sequence rt9471_init_regs[] = { + REG_SEQ0(RT9471_REG_INFO, 0x80), /* REG_RST */ + REG_SEQ0(RT9471_REG_TOP, 0xC0), /* WDT = 0 */ + REG_SEQ0(RT9471_REG_FUNC, 0x01), /* BATFET_DIS_DLY = 0 */ + REG_SEQ0(RT9471_REG_IBUS, 0x0A), /* AUTO_AICR = 0 */ + REG_SEQ0(RT9471_REG_VBUS, 0xC6), /* VAC_OVP = 14V */ + REG_SEQ0(RT9471_REG_JEITA, 0x38), /* JEITA = 0 */ + REG_SEQ0(RT9471_REG_DPDMDET, 0x31), /* BC12_EN = 0, DCP_DP_OPT = 1 */ +}; + +static int rt9471_check_devinfo(struct rt9471_chip *chip) +{ + struct device *dev = chip->dev; + unsigned int dev_id; + int ret; + + ret = regmap_field_read(chip->rm_fields[F_DEVICE_ID], &dev_id); + if (ret) + return dev_err_probe(dev, ret, "Failed to read device_id\n"); + + switch (dev_id) { + case RT9470_DEVID: + case RT9470D_DEVID: + case RT9471_DEVID: + case RT9471D_DEVID: + return 0; + default: + return dev_err_probe(dev, -ENODEV, "Incorrect device id\n"); + } +} + +static bool rt9471_accessible_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case 0x00 ... 0x0F: + case 0x10 ... 0x13: + case 0x20 ... 0x33: + case 0x40 ... 0xA1: + return true; + default: + return false; + } +} + +static const struct regmap_config rt9471_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = 0xA1, + .writeable_reg = rt9471_accessible_reg, + .readable_reg = rt9471_accessible_reg, +}; + +static int rt9471_probe(struct i2c_client *i2c) +{ + struct device *dev = &i2c->dev; + struct rt9471_chip *chip; + struct gpio_desc *ceb_gpio; + struct regmap *regmap; + int ret; + + chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); + if (!chip) + return -ENOMEM; + + chip->dev = dev; + mutex_init(&chip->var_lock); + i2c_set_clientdata(i2c, chip); + + /* Default pull charger enable pin low to allow battery charging */ + ceb_gpio = devm_gpiod_get_optional(dev, "ceb", GPIOD_OUT_LOW); + if (IS_ERR(chip->ceb_gpio)) + return dev_err_probe(dev, PTR_ERR(ceb_gpio), "Failed to config ceb gpio\n"); + + regmap = devm_regmap_init_i2c(i2c, &rt9471_regmap_config); + if (IS_ERR(regmap)) + return dev_err_probe(dev, PTR_ERR(regmap), "Failed to init regmap\n"); + + chip->regmap = regmap; + + ret = devm_regmap_field_bulk_alloc(dev, regmap, chip->rm_fields, + rt9471_reg_fields, + ARRAY_SIZE(rt9471_reg_fields)); + if (ret) + return dev_err_probe(dev, ret, "Failed to alloc regmap field\n"); + + ret = rt9471_check_devinfo(chip); + if (ret) + return ret; + + ret = regmap_register_patch(regmap, rt9471_init_regs, + ARRAY_SIZE(rt9471_init_regs)); + if (ret) + return dev_err_probe(dev, ret, "Failed to init registers\n"); + + ret = devm_regmap_add_irq_chip(dev, regmap, i2c->irq, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 0, + &rt9471_irq_chip, &chip->irq_chip_data); + if (ret) + return dev_err_probe(dev, ret, "Failed to add IRQ chip\n"); + + ret = rt9471_register_psy(chip); + if (ret) + return dev_err_probe(dev, ret, "Failed to register psy\n"); + + ret = rt9471_register_otg_regulator(chip); + if (ret) + return dev_err_probe(dev, ret, "Failed to register otg\n"); + + ret = rt9471_register_interrupts(chip); + if (ret) + return ret; + + /* After IRQs are all initialized, enable port detection by default */ + return regmap_field_write(chip->rm_fields[F_BC12_EN], 1); +} + +static void rt9471_shutdown(struct i2c_client *i2c) +{ + struct rt9471_chip *chip = i2c_get_clientdata(i2c); + + /* + * There's no external reset pin. Do register reset to guarantee charger + * function is normal after shutdown + */ + regmap_field_write(chip->rm_fields[F_REG_RST], 1); +} + +static const struct of_device_id rt9471_of_device_id[] = { + { .compatible = "richtek,rt9471" }, + {} +}; +MODULE_DEVICE_TABLE(of, rt9471_of_device_id); + +static struct i2c_driver rt9471_driver = { + .driver = { + .name = "rt9471", + .owner = THIS_MODULE, + .of_match_table = rt9471_of_device_id, + }, + .probe_new = rt9471_probe, + .shutdown = rt9471_shutdown, +}; +module_i2c_driver(rt9471_driver); + +MODULE_DESCRIPTION("Richtek RT9471 charger driver"); +MODULE_AUTHOR("Alina Yu <alina_yu@richtek.com>"); +MODULE_AUTHOR("ChiYuan Huang <cy_huang@richtek.com>"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/power/supply/rt9471.h b/drivers/power/supply/rt9471.h new file mode 100644 index 00000000..f3d8e23 --- /dev/null +++ b/drivers/power/supply/rt9471.h @@ -0,0 +1,76 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2022 Richtek Technology Corp. */ + +#ifndef __RT9471_CHARGER_H +#define __RT9471_CHARGER_H + +#define RT9471_IRQ_BC12_DONE 0 +#define RT9471_IRQ_DETACH 1 +#define RT9471_IRQ_RECHG 2 +#define RT9471_IRQ_CHG_DONE 3 +#define RT9471_IRQ_BG_CHG 4 +#define RT9471_IRQ_IE0C 5 +#define RT9471_IRQ_CHG_RDY 6 +#define RT9471_IRQ_VBUS_GD 7 +#define RT9471_IRQ_CHG_BATOV 9 +#define RT9471_IRQ_CHG_SYSOV 10 +#define RT9471_IRQ_CHG_TOUT 11 +#define RT9471_IRQ_CHG_BUSUV 12 +#define RT9471_IRQ_CHG_THREG 13 +#define RT9471_IRQ_CHG_AICR 14 +#define RT9471_IRQ_CHG_MIVR 15 +#define RT9471_IRQ_SYS_SHORT 16 +#define RT9471_IRQ_SYS_MIN 17 +#define RT9471_IRQ_AICC_DONE 18 +#define RT9471_IRQ_PE_DONE 19 +#define RT9471_IRQ_JEITA_COLD 20 +#define RT9471_IRQ_JEITA_COOL 21 +#define RT9471_IRQ_JEITA_WARM 22 +#define RT9471_IRQ_JEITA_HOT 23 +#define RT9471_IRQ_OTG_FAULT 24 +#define RT9471_IRQ_OTG_LBP 25 +#define RT9471_IRQ_OTG_CC 26 +#define RT9471_IRQ_WDT 29 +#define RT9471_IRQ_VAC_OV 30 +#define RT9471_IRQ_OTP 31 + +#define RT9471_REG_OTGCFG 0x00 +#define RT9471_REG_TOP 0x01 +#define RT9471_REG_FUNC 0x02 +#define RT9471_REG_IBUS 0x03 +#define RT9471_REG_VBUS 0x04 +#define RT9471_REG_PRECHG 0x05 +#define RT9471_REG_VCHG 0x07 +#define RT9471_REG_ICHG 0x08 +#define RT9471_REG_CHGTMR 0x09 +#define RT9471_REG_EOC 0x0A +#define RT9471_REG_INFO 0x0B +#define RT9471_REG_JEITA 0x0C +#define RT9471_REG_PUMP_EXP 0x0D +#define RT9471_REG_DPDMDET 0x0E +#define RT9471_REG_ICSTAT 0x0F +#define RT9471_REG_STAT0 0x10 +#define RT9471_REG_STAT1 0x11 +#define RT9471_REG_STAT2 0x12 +#define RT9471_REG_IRQ0 0x20 +#define RT9471_REG_MASK0 0x30 + +#define RT9471_OTGCV_MASK GENMASK(7, 6) +#define RT9471_OTGCC_MASK BIT(0) +#define RT9471_OTGEN_MASK BIT(1) +#define RT9471_CHGFAULT_MASK GENMASK(4, 1) + +/* Device ID */ +#define RT9470_DEVID 0x09 +#define RT9470D_DEVID 0x0A +#define RT9471_DEVID 0x0D +#define RT9471D_DEVID 0x0E + +#define RT9471_NUM_IRQ_REGS 4 +#define RT9471_OTGCV_MINUV 4850000 +#define RT9471_OTGCV_STEPUV 150000 +#define RT9471_NUM_VOTG 4 +#define RT9471_VCHG_MAXUV 4700000 +#define RT9471_ICHG_MAXUA 3150000 + +#endif /* __RT9471_CHARGER_H */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver 2022-08-11 13:41 ` [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver cy_huang @ 2022-08-15 5:53 ` Matti Vaittinen 2022-08-15 6:10 ` ChiYuan Huang 0 siblings, 1 reply; 16+ messages in thread From: Matti Vaittinen @ 2022-08-15 5:53 UTC (permalink / raw) To: cy_huang Cc: Rob Herring, krzysztof.kozlowski+dt, Sebastian Reichel, alina_yu, ChiYuan Huang, alinayu829, Linux PM list, devicetree, Linux Kernel Mailing List Hi ChiYuan, Thanks for the patch :) to 11. elok. 2022 klo 16.43 cy_huang (u0084500@gmail.com) kirjoitti: > > From: ChiYuan Huang <cy_huang@richtek.com> > > Add support for the RT9471 3A 1-Cell Li+ battery charger. > > The RT9471 is a highly-integrated 3A switch mode battery charger with > low impedance power path to better optimize the charging efficiency. > > Co-developed-by: Alina Yu <alina_yu@richtek.com> > Signed-off-by: Alina Yu <alina_yu@richtek.com> > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > --- > + > +static const struct linear_range rt9471_chg_ranges[RT9471_MAX_RANGES] = { > + [RT9471_RANGE_AICR] = { 50000, 1, 63, 50000 }, > + [RT9471_RANGE_MIVR] = { 3900000, 0, 15, 100000 }, > + [RT9471_RANGE_IPRE] = { 50000, 0, 15, 50000 }, > + [RT9471_RANGE_VCHG] = { 3900000, 0, 80, 10000 }, > + [RT9471_RANGE_ICHG] = { 0, 0, 63, 50000 }, > + [RT9471_RANGE_IEOC] = { 50000, 0, 15, 50000 }, > +}; I just jumped in to ask if that could you please use the field names? Eg. { .min = 50000, .min_sel = 1, .max_sel = 63, .step = 50000 }, This would make it less error prone in case someone changes the members in struct linear_range. > + > +static int rt9471_set_value_by_field_range(struct rt9471_chip *chip, > + enum rt9471_fields field, > + enum rt9471_ranges range, int val) > +{ > + unsigned int sel; > + > + if (val < 0) > + return -EINVAL; > + > + linear_range_get_selector_within(rt9471_chg_ranges + range, val, &sel); > + > + return regmap_field_write(chip->rm_fields[field], sel); > +} > + > + > +static int rt9471_get_value_by_field_range(struct rt9471_chip *chip, > + enum rt9471_fields field, > + enum rt9471_ranges range, int *val) > +{ > + unsigned int sel, rvalue; > + int ret; > + > + ret = regmap_field_read(chip->rm_fields[field], &sel); > + if (ret) > + return ret; > + > + ret = linear_range_get_value(rt9471_chg_ranges + range, sel, &rvalue); > + if (ret) > + return ret; > + > + *val = rvalue; > + return 0; > +} > + > +static inline int rt9471_set_hiz(struct rt9471_chip *chip, int enable) > +{ > + return regmap_field_write(chip->rm_fields[F_HZ], enable); > +} > + > +static inline int rt9471_set_ichg(struct rt9471_chip *chip, int microamp) > +{ > + return rt9471_set_value_by_field_range(chip, F_ICHG_REG, > + RT9471_RANGE_ICHG, microamp); > +} > + > +static inline int rt9471_get_ichg(struct rt9471_chip *chip, int *microamp) > +{ > + return rt9471_get_value_by_field_range(chip, F_ICHG_REG, > + RT9471_RANGE_ICHG, microamp); > +} > + > +static inline int rt9471_set_cv(struct rt9471_chip *chip, int microvolt) > +{ > + return rt9471_set_value_by_field_range(chip, F_VBAT_REG, > + RT9471_RANGE_VCHG, microvolt); > +} > + > +static inline int rt9471_get_cv(struct rt9471_chip *chip, int *microamp) > +{ > + return rt9471_get_value_by_field_range(chip, F_VBAT_REG, > + RT9471_RANGE_VCHG, microamp); > +} > + > +static inline int rt9471_set_mivr(struct rt9471_chip *chip, int microvolt) > +{ > + return rt9471_set_value_by_field_range(chip, F_MIVR, > + RT9471_RANGE_MIVR, microvolt); > +} > + > +static inline int rt9471_get_mivr(struct rt9471_chip *chip, int *microvolt) > +{ > + return rt9471_get_value_by_field_range(chip, F_MIVR, > + RT9471_RANGE_MIVR, microvolt); > +} > + > +static inline int rt9471_set_aicr(struct rt9471_chip *chip, int microamp) > +{ > + return rt9471_set_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, > + microamp); > +} > + > +static inline int rt9471_get_aicr(struct rt9471_chip *chip, int *microamp) > +{ > + return rt9471_get_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, > + microamp); > +} > + > +static inline int rt9471_set_iprechg(struct rt9471_chip *chip, int microamp) > +{ > + return rt9471_set_value_by_field_range(chip, F_IPRE_CHG, > + RT9471_RANGE_IPRE, microamp); > +} > + > +static inline int rt9471_get_iprechg(struct rt9471_chip *chip, int *microamp) > +{ > + return rt9471_get_value_by_field_range(chip, F_IPRE_CHG, > + RT9471_RANGE_IPRE, microamp); > +} > + > +static inline int rt9471_set_ieoc(struct rt9471_chip *chip, int microamp) > +{ > + return rt9471_set_value_by_field_range(chip, F_IEOC_CHG, > + RT9471_RANGE_IEOC, microamp); > +} > + > +static inline int rt9471_get_ieoc(struct rt9471_chip *chip, int *microamp) > +{ > + return rt9471_get_value_by_field_range(chip, F_IEOC_CHG, > + RT9471_RANGE_IEOC, microamp); > +} > + > +static inline int rt9471_set_chg_enable(struct rt9471_chip *chip, int enable) > +{ > + return regmap_field_write(chip->rm_fields[F_CHG_EN], !!enable); > +} > + //snip > + > +static inline struct rt9471_chip * psy_device_to_chip(struct device *dev) > +{ > + return power_supply_get_drvdata(to_power_supply(dev)); > +} While skimming through the rest of the patch... This may just be my personal preference but wrapper functions with just one line are rarely beneficial. In the worst case they just add more lines AND hide the details of what actually is done without any clear benefits. Well, this is just my view so please ignore this comment if wrappers like this are a "subsystem standard" Other than that the patch looks good to me. -- Matti Vaittinen Linux kernel developer at ROHM Semiconductors Oulu Finland ~~ When things go utterly wrong vim users can always type :help! ~~ Discuss - Estimate - Plan - Report and finally accomplish this: void do_work(int time) __attribute__ ((const)); ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver 2022-08-15 5:53 ` Matti Vaittinen @ 2022-08-15 6:10 ` ChiYuan Huang 2022-08-15 7:24 ` Matti Vaittinen 0 siblings, 1 reply; 16+ messages in thread From: ChiYuan Huang @ 2022-08-15 6:10 UTC (permalink / raw) To: Matti Vaittinen Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, ChiYuan Huang, alinayu829, Linux PM list, devicetree, Linux Kernel Mailing List Matti Vaittinen <mazziesaccount@gmail.com> 於 2022年8月15日 週一 下午1:53寫道： > > Hi ChiYuan, > > Thanks for the patch :) > > to 11. elok. 2022 klo 16.43 cy_huang (u0084500@gmail.com) kirjoitti: > > > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > Add support for the RT9471 3A 1-Cell Li+ battery charger. > > > > The RT9471 is a highly-integrated 3A switch mode battery charger with > > low impedance power path to better optimize the charging efficiency. > > > > Co-developed-by: Alina Yu <alina_yu@richtek.com> > > Signed-off-by: Alina Yu <alina_yu@richtek.com> > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > > --- > > > + > > +static const struct linear_range rt9471_chg_ranges[RT9471_MAX_RANGES] = { > > + [RT9471_RANGE_AICR] = { 50000, 1, 63, 50000 }, > > + [RT9471_RANGE_MIVR] = { 3900000, 0, 15, 100000 }, > > + [RT9471_RANGE_IPRE] = { 50000, 0, 15, 50000 }, > > + [RT9471_RANGE_VCHG] = { 3900000, 0, 80, 10000 }, > > + [RT9471_RANGE_ICHG] = { 0, 0, 63, 50000 }, > > + [RT9471_RANGE_IEOC] = { 50000, 0, 15, 50000 }, > > +}; > > I just jumped in to ask if that could you please use the field names? Eg. > { .min = 50000, .min_sel = 1, .max_sel = 63, .step = 50000 }, > > This would make it less error prone in case someone changes the > members in struct linear_range. > Yes, sure, if something changed for this structure, this could be a problem. Thanks for the comment. > > + > > +static int rt9471_set_value_by_field_range(struct rt9471_chip *chip, > > + enum rt9471_fields field, > > + enum rt9471_ranges range, int val) > > +{ > > + unsigned int sel; > > + > > + if (val < 0) > > + return -EINVAL; > > + > > + linear_range_get_selector_within(rt9471_chg_ranges + range, val, &sel); > > + > > + return regmap_field_write(chip->rm_fields[field], sel); > > +} > > + > > + > > +static int rt9471_get_value_by_field_range(struct rt9471_chip *chip, > > + enum rt9471_fields field, > > + enum rt9471_ranges range, int *val) > > +{ > > + unsigned int sel, rvalue; > > + int ret; > > + > > + ret = regmap_field_read(chip->rm_fields[field], &sel); > > + if (ret) > > + return ret; > > + > > + ret = linear_range_get_value(rt9471_chg_ranges + range, sel, &rvalue); > > + if (ret) > > + return ret; > > + > > + *val = rvalue; > > + return 0; > > +} > > + > > +static inline int rt9471_set_hiz(struct rt9471_chip *chip, int enable) > > +{ > > + return regmap_field_write(chip->rm_fields[F_HZ], enable); > > +} > > + > > +static inline int rt9471_set_ichg(struct rt9471_chip *chip, int microamp) > > +{ > > + return rt9471_set_value_by_field_range(chip, F_ICHG_REG, > > + RT9471_RANGE_ICHG, microamp); > > +} > > + > > +static inline int rt9471_get_ichg(struct rt9471_chip *chip, int *microamp) > > +{ > > + return rt9471_get_value_by_field_range(chip, F_ICHG_REG, > > + RT9471_RANGE_ICHG, microamp); > > +} > > + > > +static inline int rt9471_set_cv(struct rt9471_chip *chip, int microvolt) > > +{ > > + return rt9471_set_value_by_field_range(chip, F_VBAT_REG, > > + RT9471_RANGE_VCHG, microvolt); > > +} > > + > > +static inline int rt9471_get_cv(struct rt9471_chip *chip, int *microamp) > > +{ > > + return rt9471_get_value_by_field_range(chip, F_VBAT_REG, > > + RT9471_RANGE_VCHG, microamp); > > +} > > + > > +static inline int rt9471_set_mivr(struct rt9471_chip *chip, int microvolt) > > +{ > > + return rt9471_set_value_by_field_range(chip, F_MIVR, > > + RT9471_RANGE_MIVR, microvolt); > > +} > > + > > +static inline int rt9471_get_mivr(struct rt9471_chip *chip, int *microvolt) > > +{ > > + return rt9471_get_value_by_field_range(chip, F_MIVR, > > + RT9471_RANGE_MIVR, microvolt); > > +} > > + > > +static inline int rt9471_set_aicr(struct rt9471_chip *chip, int microamp) > > +{ > > + return rt9471_set_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, > > + microamp); > > +} > > + > > +static inline int rt9471_get_aicr(struct rt9471_chip *chip, int *microamp) > > +{ > > + return rt9471_get_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, > > + microamp); > > +} > > + > > +static inline int rt9471_set_iprechg(struct rt9471_chip *chip, int microamp) > > +{ > > + return rt9471_set_value_by_field_range(chip, F_IPRE_CHG, > > + RT9471_RANGE_IPRE, microamp); > > +} > > + > > +static inline int rt9471_get_iprechg(struct rt9471_chip *chip, int *microamp) > > +{ > > + return rt9471_get_value_by_field_range(chip, F_IPRE_CHG, > > + RT9471_RANGE_IPRE, microamp); > > +} > > + > > +static inline int rt9471_set_ieoc(struct rt9471_chip *chip, int microamp) > > +{ > > + return rt9471_set_value_by_field_range(chip, F_IEOC_CHG, > > + RT9471_RANGE_IEOC, microamp); > > +} > > + > > +static inline int rt9471_get_ieoc(struct rt9471_chip *chip, int *microamp) > > +{ > > + return rt9471_get_value_by_field_range(chip, F_IEOC_CHG, > > + RT9471_RANGE_IEOC, microamp); > > +} > > + > > +static inline int rt9471_set_chg_enable(struct rt9471_chip *chip, int enable) > > +{ > > + return regmap_field_write(chip->rm_fields[F_CHG_EN], !!enable); > > +} > > + > > //snip > > > + > > +static inline struct rt9471_chip * psy_device_to_chip(struct device *dev) > > +{ > > + return power_supply_get_drvdata(to_power_supply(dev)); > > +} > > While skimming through the rest of the patch... This may just be my > personal preference but wrapper functions with just one line are > rarely beneficial. In the worst case they just add more lines AND hide > the details of what actually is done without any clear benefits. Well, > this is just my view so please ignore this comment if wrappers like > this are a "subsystem standard" > I'm not sure what the 'subsystem standard' is. I declare it as 'inline' function and the function name to tell the user what I'm doing. This may be silly. But from my aspect, it makes each property set/get more clear. > Other than that the patch looks good to me. > > -- > > Matti Vaittinen > Linux kernel developer at ROHM Semiconductors > Oulu Finland > > ~~ When things go utterly wrong vim users can always type :help! ~~ > > Discuss - Estimate - Plan - Report and finally accomplish this: > void do_work(int time) __attribute__ ((const)); ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver 2022-08-15 6:10 ` ChiYuan Huang @ 2022-08-15 7:24 ` Matti Vaittinen 0 siblings, 0 replies; 16+ messages in thread From: Matti Vaittinen @ 2022-08-15 7:24 UTC (permalink / raw) To: ChiYuan Huang Cc: Rob Herring, Krzysztof Kozlowski, Sebastian Reichel, 游子馨, ChiYuan Huang, alinayu829, Linux PM list, devicetree, Linux Kernel Mailing List ma 15. elok. 2022 klo 9.11 ChiYuan Huang (u0084500@gmail.com) kirjoitti: > > Matti Vaittinen <mazziesaccount@gmail.com> 於 2022年8月15日 週一 下午1:53寫道： > > > > Hi ChiYuan, > > > > Thanks for the patch :) > > > > to 11. elok. 2022 klo 16.43 cy_huang (u0084500@gmail.com) kirjoitti: > > > > > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > > > Add support for the RT9471 3A 1-Cell Li+ battery charger. > > > > > > The RT9471 is a highly-integrated 3A switch mode battery charger with > > > low impedance power path to better optimize the charging efficiency. > > > > > > Co-developed-by: Alina Yu <alina_yu@richtek.com> > > > Signed-off-by: Alina Yu <alina_yu@richtek.com> > > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > > > --- > > > > While skimming through the rest of the patch... This may just be my > > personal preference but wrapper functions with just one line are > > rarely beneficial. In the worst case they just add more lines AND hide > > the details of what actually is done without any clear benefits. Well, > > this is just my view so please ignore this comment if wrappers like > > this are a "subsystem standard" > > > I'm not sure what the 'subsystem standard' is. > I declare it as 'inline' function and the function name to tell the > user what I'm doing. > This may be silly. But from my aspect, it makes each property set/get > more clear. I guess this is Ok if the maintainer does not complain. And if he does - then we at least know the "subsystem standard" ;) Yours -- Matti -- Matti Vaittinen Linux kernel developer at ROHM Semiconductors Oulu Finland ~~ When things go utterly wrong vim users can always type :help! ~~ ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-08-16 9:11 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-08-11 13:41 [PATCH 0/2] Add Richtek RT9471 3A battery charger support cy_huang 2022-08-11 13:41 ` [PATCH 1/2] dt-bindings: power: supply: Add Richtek RT9471 battery charger cy_huang 2022-08-11 14:12 ` Krzysztof Kozlowski 2022-08-12 1:32 ` ChiYuan Huang 2022-08-12 6:54 ` Krzysztof Kozlowski 2022-08-12 15:57 ` ChiYuan Huang 2022-08-12 16:05 ` ChiYuan Huang 2022-08-12 18:53 ` Krzysztof Kozlowski 2022-08-13 14:52 ` ChiYuan Huang 2022-08-16 7:27 ` Krzysztof Kozlowski 2022-08-12 15:13 ` Rob Herring 2022-08-12 16:07 ` ChiYuan Huang 2022-08-11 13:41 ` [PATCH 2/2] power: supply: rt9471: Add Richtek RT9471 charger driver cy_huang 2022-08-15 5:53 ` Matti Vaittinen 2022-08-15 6:10 ` ChiYuan Huang 2022-08-15 7:24 ` Matti Vaittinen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).