This patchset adds the charger driver "rt5033-charger". It is part of the
multifunction device rt5033. The patchset is based on an older version by
Beomho Seo of March 2015. For more information on the history and setup of
the patchset see the cover sheet of version v1, there is a link further down
below the changelog.
RESEND: Sorry for spamming. The first try of sending v6 got interrupted and
was split into two threads on the lore list. Therefore sending it again.
Changes in v6:
- Patch 5: In function rt5033_charger_probe() after
calling rt5033_charger_dt_init() replaced the return value from "-ENODEV"
to "PTR_ERR(charger->chg)", as suggested by Christophe.
- Patch 9: Changed the patch from adding "power-supplies: true" to replacing
"additionalProperties: false" by "unevaluatedProperties: false", as
suggested by Krzysztof.
v1: https://lore.kernel.org/linux-pm/[email protected]/T/#t
v2: https://lore.kernel.org/linux-pm/[email protected]/T/#t
v3: https://lore.kernel.org/linux-pm/[email protected]/T/#t
v4: https://lore.kernel.org/linux-pm/[email protected]/T/#t
v5: https://lore.kernel.org/linux-pm/[email protected]/T/#t
The result of the patchset v6 can be seen at:
https://github.com/Jakko3/linux/blob/rt5033-charger_v6/drivers/power/supply/rt5033_charger.c
Jakob Hauser (9):
mfd: rt5033: Fix chip revision readout
mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
mfd: rt5033: Apply preparatory changes before adding rt5033-charger
driver
power: supply: rt5033_charger: Add RT5033 charger device driver
power: supply: rt5033_charger: Add cable detection and USB OTG supply
power: supply: rt5033_battery: Move struct rt5033_battery to battery
driver
power: supply: rt5033_battery: Adopt status property from charger
dt-bindings: power: supply: rt5033-battery: Apply
unevaluatedProperties
dt-bindings: Add rt5033 mfd, regulator and charger
Stephan Gerhold (1):
mfd: rt5033: Drop rt5033-battery sub-device
.../bindings/mfd/richtek,rt5033.yaml | 138 ++++
.../power/supply/richtek,rt5033-battery.yaml | 2 +-
.../power/supply/richtek,rt5033-charger.yaml | 65 ++
drivers/mfd/rt5033.c | 8 +-
drivers/power/supply/Kconfig | 8 +
drivers/power/supply/Makefile | 1 +
drivers/power/supply/rt5033_battery.c | 38 +-
drivers/power/supply/rt5033_charger.c | 744 ++++++++++++++++++
include/linux/mfd/rt5033-private.h | 64 +-
include/linux/mfd/rt5033.h | 24 -
10 files changed, 1034 insertions(+), 58 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
create mode 100644 drivers/power/supply/rt5033_charger.c
--
2.39.2
From: Stephan Gerhold <[email protected]>
The fuel gauge in the RT5033 PMIC (rt5033-battery) has its own I2C bus
and interrupt lines. Therefore, it is not part of the MFD device
and needs to be specified separately in the device tree.
Cc: Beomho Seo <[email protected]>
Cc: Chanwoo Choi <[email protected]>
Fixes: 0b271258544b ("mfd: rt5033: Add Richtek RT5033 driver core.")
Signed-off-by: Stephan Gerhold <[email protected]>
Acked-by: Lee Jones <[email protected]>
Signed-off-by: Jakob Hauser <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
---
drivers/mfd/rt5033.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c
index a5e520fe50a1..8029d444b794 100644
--- a/drivers/mfd/rt5033.c
+++ b/drivers/mfd/rt5033.c
@@ -40,9 +40,6 @@ static const struct mfd_cell rt5033_devs[] = {
{
.name = "rt5033-charger",
.of_compatible = "richtek,rt5033-charger",
- }, {
- .name = "rt5033-battery",
- .of_compatible = "richtek,rt5033-battery",
}, {
.name = "rt5033-led",
.of_compatible = "richtek,rt5033-led",
--
2.39.2
Add device tree binding documentation for rt5033 multifunction device, voltage
regulator and battery charger.
Cc: Beomho Seo <[email protected]>
Cc: Chanwoo Choi <[email protected]>
Signed-off-by: Jakob Hauser <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/mfd/richtek,rt5033.yaml | 138 ++++++++++++++++++
.../power/supply/richtek,rt5033-charger.yaml | 65 +++++++++
2 files changed, 203 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
diff --git a/Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml b/Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
new file mode 100644
index 000000000000..386b1a50158a
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
@@ -0,0 +1,138 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/richtek,rt5033.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Richtek RT5033 Power Management Integrated Circuit
+
+maintainers:
+ - Jakob Hauser <[email protected]>
+
+description:
+ RT5033 is a multifunction device which includes battery charger, fuel gauge,
+ flash LED current source, LDO and synchronous Buck converter for portable
+ applications. It is interfaced to host controller using I2C interface. The
+ battery fuel gauge uses a separate I2C bus.
+
+properties:
+ compatible:
+ const: richtek,rt5033
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ regulators:
+ description:
+ The regulators of RT5033 have to be instantiated under a sub-node named
+ "regulators". For SAFE_LDO voltage there is only one value of 4.9 V. LDO
+ voltage ranges from 1.2 V to 3.0 V in 0.1 V steps. BUCK voltage ranges
+ from 1.0 V to 3.0 V in 0.1 V steps.
+ type: object
+ patternProperties:
+ "^(SAFE_LDO|LDO|BUCK)$":
+ type: object
+ $ref: /schemas/regulator/regulator.yaml#
+ unevaluatedProperties: false
+ additionalProperties: false
+
+ charger:
+ type: object
+ $ref: /schemas/power/supply/richtek,rt5033-charger.yaml#
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+
+ battery: battery {
+ compatible = "simple-battery";
+ precharge-current-microamp = <450000>;
+ constant-charge-current-max-microamp = <1000000>;
+ charge-term-current-microamp = <150000>;
+ precharge-upper-limit-microvolt = <3500000>;
+ constant-charge-voltage-max-microvolt = <4350000>;
+ };
+
+ extcon {
+ usb_con: connector {
+ compatible = "usb-b-connector";
+ label = "micro-USB";
+ type = "micro";
+ };
+ };
+
+ i2c {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ i2c@0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ fuel-gauge@35 {
+ compatible = "richtek,rt5033-battery";
+ reg = <0x35>;
+
+ interrupt-parent = <&msmgpio>;
+ interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&fg_alert_default>;
+
+ power-supplies = <&rt5033_charger>;
+ };
+ };
+
+ i2c@1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ pmic@34 {
+ compatible = "richtek,rt5033";
+ reg = <0x34>;
+
+ interrupt-parent = <&msmgpio>;
+ interrupts = <62 IRQ_TYPE_EDGE_FALLING>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pmic_int_default>;
+
+ regulators {
+ safe_ldo_reg: SAFE_LDO {
+ regulator-name = "SAFE_LDO";
+ regulator-min-microvolt = <4900000>;
+ regulator-max-microvolt = <4900000>;
+ regulator-always-on;
+ };
+ ldo_reg: LDO {
+ regulator-name = "LDO";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ };
+ buck_reg: BUCK {
+ regulator-name = "BUCK";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ };
+ };
+
+ rt5033_charger: charger {
+ compatible = "richtek,rt5033-charger";
+ monitored-battery = <&battery>;
+ richtek,usb-connector = <&usb_con>;
+ };
+ };
+ };
+ };
diff --git a/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml b/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
new file mode 100644
index 000000000000..5b3edd79a523
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
@@ -0,0 +1,65 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/power/supply/richtek,rt5033-charger.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Richtek RT5033 PMIC Battery Charger
+
+maintainers:
+ - Jakob Hauser <[email protected]>
+
+description:
+ The battery charger of the multifunction device RT5033 has to be instantiated
+ under sub-node named "charger" using the following format.
+
+properties:
+ compatible:
+ const: richtek,rt5033-charger
+
+ monitored-battery:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description: |
+ Phandle to the monitored battery according to battery.yaml. The battery
+ node needs to contain five parameters.
+
+ precharge-current-microamp:
+ Current of pre-charge mode. The pre-charge current levels are 350 mA
+ to 650 mA programmed by I2C per 100 mA.
+
+ constant-charge-current-max-microamp:
+ Current of fast-charge mode. The fast-charge current levels are 700 mA
+ to 2000 mA programmed by I2C per 100 mA.
+
+ charge-term-current-microamp:
+ This property is end of charge current. Its level ranges from 150 mA
+ to 600 mA. Between 150 mA and 300 mA in 50 mA steps, between 300 mA and
+ 600 mA in 100 mA steps.
+
+ precharge-upper-limit-microvolt:
+ Voltage of pre-charge mode. If the battery voltage is below the pre-charge
+ threshold voltage, the charger is in pre-charge mode with pre-charge
+ current. Its levels are 2.3 V to 3.8 V programmed by I2C per 0.1 V.
+
+ constant-charge-voltage-max-microvolt:
+ Battery regulation voltage of constant voltage mode. This voltage levels
+ from 3.65 V to 4.4 V by I2C per 0.025 V.
+
+ richtek,usb-connector:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to a USB connector according to usb-connector.yaml. The connector
+ should be a child of the extcon device.
+
+required:
+ - monitored-battery
+
+additionalProperties: false
+
+examples:
+ - |
+ charger {
+ compatible = "richtek,rt5033-charger";
+ monitored-battery = <&battery>;
+ richtek,usb-connector = <&usb_con>;
+ };
--
2.39.2
Dear all,
On 15.05.23 22:57, Jakob Hauser wrote:
> This patchset adds the charger driver "rt5033-charger". It is part of the
> multifunction device rt5033. The patchset is based on an older version by
> Beomho Seo of March 2015. For more information on the history and setup of
> the patchset see the cover sheet of version v1, there is a link further down
> below the changelog.
>
> RESEND: Sorry for spamming. The first try of sending v6 got interrupted and
> was split into two threads on the lore list. Therefore sending it again.
>
> Changes in v6:
> - Patch 5: In function rt5033_charger_probe() after
> calling rt5033_charger_dt_init() replaced the return value from "-ENODEV"
> to "PTR_ERR(charger->chg)", as suggested by Christophe.
> - Patch 9: Changed the patch from adding "power-supplies: true" to replacing
> "additionalProperties: false" by "unevaluatedProperties: false", as
> suggested by Krzysztof.
>
> v1: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v2: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v3: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v4: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v5: https://lore.kernel.org/linux-pm/[email protected]/T/#t
>
> The result of the patchset v6 can be seen at:
> https://github.com/Jakko3/linux/blob/rt5033-charger_v6/drivers/power/supply/rt5033_charger.c
What's missing on this patchset? I'm not familiar with the procedures.
If all patches need ack's, then the ones for mfd (patches 2 & 4) and for
dt-bindings (patch 10) are missing.
Link to the current patchset v6:
- on lore:
https://lore.kernel.org/linux-pm/[email protected]/T/#t
- on patchwork:
https://patchwork.kernel.org/project/linux-pm/list/?series=747771&state=%2A&archive=both
> Jakob Hauser (9):
> mfd: rt5033: Fix chip revision readout
> mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
> mfd: rt5033: Apply preparatory changes before adding rt5033-charger
> driver
> power: supply: rt5033_charger: Add RT5033 charger device driver
> power: supply: rt5033_charger: Add cable detection and USB OTG supply
> power: supply: rt5033_battery: Move struct rt5033_battery to battery
> driver
> power: supply: rt5033_battery: Adopt status property from charger
> dt-bindings: power: supply: rt5033-battery: Apply
> unevaluatedProperties
> dt-bindings: Add rt5033 mfd, regulator and charger
>
> Stephan Gerhold (1):
> mfd: rt5033: Drop rt5033-battery sub-device
>
> .../bindings/mfd/richtek,rt5033.yaml | 138 ++++
> .../power/supply/richtek,rt5033-battery.yaml | 2 +-
> .../power/supply/richtek,rt5033-charger.yaml | 65 ++
> drivers/mfd/rt5033.c | 8 +-
> drivers/power/supply/Kconfig | 8 +
> drivers/power/supply/Makefile | 1 +
> drivers/power/supply/rt5033_battery.c | 38 +-
> drivers/power/supply/rt5033_charger.c | 744 ++++++++++++++++++
> include/linux/mfd/rt5033-private.h | 64 +-
> include/linux/mfd/rt5033.h | 24 -
> 10 files changed, 1034 insertions(+), 58 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
> create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
> create mode 100644 drivers/power/supply/rt5033_charger.c
Kind regards,
Jakob
On Wed, 31 May 2023, Jakob Hauser wrote:
> Dear all,
>
> On 15.05.23 22:57, Jakob Hauser wrote:
> > This patchset adds the charger driver "rt5033-charger". It is part of the
> > multifunction device rt5033. The patchset is based on an older version by
> > Beomho Seo of March 2015. For more information on the history and setup of
> > the patchset see the cover sheet of version v1, there is a link further down
> > below the changelog.
> >
> > RESEND: Sorry for spamming. The first try of sending v6 got interrupted and
> > was split into two threads on the lore list. Therefore sending it again.
> >
> > Changes in v6:
> > - Patch 5: In function rt5033_charger_probe() after
> > calling rt5033_charger_dt_init() replaced the return value from "-ENODEV"
> > to "PTR_ERR(charger->chg)", as suggested by Christophe.
> > - Patch 9: Changed the patch from adding "power-supplies: true" to replacing
> > "additionalProperties: false" by "unevaluatedProperties: false", as
> > suggested by Krzysztof.
> >
> > v1: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> > v2: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> > v3: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> > v4: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> > v5: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> >
> > The result of the patchset v6 can be seen at:
> > https://github.com/Jakko3/linux/blob/rt5033-charger_v6/drivers/power/supply/rt5033_charger.c
>
> What's missing on this patchset? I'm not familiar with the procedures. If
> all patches need ack's, then the ones for mfd (patches 2 & 4) and for
> dt-bindings (patch 10) are missing.
You're waiting on me. I will apply all of the patches and submit a PR.
You're in the queue - please stand-by.
> Link to the current patchset v6:
> - on lore: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> - on patchwork: https://patchwork.kernel.org/project/linux-pm/list/?series=747771&state=%2A&archive=both
>
> > Jakob Hauser (9):
> > mfd: rt5033: Fix chip revision readout
> > mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
> > mfd: rt5033: Apply preparatory changes before adding rt5033-charger
> > driver
> > power: supply: rt5033_charger: Add RT5033 charger device driver
> > power: supply: rt5033_charger: Add cable detection and USB OTG supply
> > power: supply: rt5033_battery: Move struct rt5033_battery to battery
> > driver
> > power: supply: rt5033_battery: Adopt status property from charger
> > dt-bindings: power: supply: rt5033-battery: Apply
> > unevaluatedProperties
> > dt-bindings: Add rt5033 mfd, regulator and charger
> >
> > Stephan Gerhold (1):
> > mfd: rt5033: Drop rt5033-battery sub-device
> >
> > .../bindings/mfd/richtek,rt5033.yaml | 138 ++++
> > .../power/supply/richtek,rt5033-battery.yaml | 2 +-
> > .../power/supply/richtek,rt5033-charger.yaml | 65 ++
> > drivers/mfd/rt5033.c | 8 +-
> > drivers/power/supply/Kconfig | 8 +
> > drivers/power/supply/Makefile | 1 +
> > drivers/power/supply/rt5033_battery.c | 38 +-
> > drivers/power/supply/rt5033_charger.c | 744 ++++++++++++++++++
> > include/linux/mfd/rt5033-private.h | 64 +-
> > include/linux/mfd/rt5033.h | 24 -
> > 10 files changed, 1034 insertions(+), 58 deletions(-)
> > create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
> > create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
> > create mode 100644 drivers/power/supply/rt5033_charger.c
>
> Kind regards,
> Jakob
--
Lee Jones [李琼斯]
On Mon, 15 May 2023, Jakob Hauser wrote:
> This patchset adds the charger driver "rt5033-charger". It is part of the
> multifunction device rt5033. The patchset is based on an older version by
> Beomho Seo of March 2015. For more information on the history and setup of
> the patchset see the cover sheet of version v1, there is a link further down
> below the changelog.
>
> RESEND: Sorry for spamming. The first try of sending v6 got interrupted and
> was split into two threads on the lore list. Therefore sending it again.
>
> Changes in v6:
> - Patch 5: In function rt5033_charger_probe() after
> calling rt5033_charger_dt_init() replaced the return value from "-ENODEV"
> to "PTR_ERR(charger->chg)", as suggested by Christophe.
> - Patch 9: Changed the patch from adding "power-supplies: true" to replacing
> "additionalProperties: false" by "unevaluatedProperties: false", as
> suggested by Krzysztof.
>
> v1: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v2: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v3: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v4: https://lore.kernel.org/linux-pm/[email protected]/T/#t
> v5: https://lore.kernel.org/linux-pm/[email protected]/T/#t
>
> The result of the patchset v6 can be seen at:
> https://github.com/Jakko3/linux/blob/rt5033-charger_v6/drivers/power/supply/rt5033_charger.c
>
> Jakob Hauser (9):
> mfd: rt5033: Fix chip revision readout
> mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
> mfd: rt5033: Apply preparatory changes before adding rt5033-charger
> driver
> power: supply: rt5033_charger: Add RT5033 charger device driver
> power: supply: rt5033_charger: Add cable detection and USB OTG supply
> power: supply: rt5033_battery: Move struct rt5033_battery to battery
> driver
> power: supply: rt5033_battery: Adopt status property from charger
> dt-bindings: power: supply: rt5033-battery: Apply
> unevaluatedProperties
> dt-bindings: Add rt5033 mfd, regulator and charger
>
> Stephan Gerhold (1):
> mfd: rt5033: Drop rt5033-battery sub-device
>
> .../bindings/mfd/richtek,rt5033.yaml | 138 ++++
> .../power/supply/richtek,rt5033-battery.yaml | 2 +-
> .../power/supply/richtek,rt5033-charger.yaml | 65 ++
> drivers/mfd/rt5033.c | 8 +-
> drivers/power/supply/Kconfig | 8 +
> drivers/power/supply/Makefile | 1 +
> drivers/power/supply/rt5033_battery.c | 38 +-
> drivers/power/supply/rt5033_charger.c | 744 ++++++++++++++++++
> include/linux/mfd/rt5033-private.h | 64 +-
> include/linux/mfd/rt5033.h | 24 -
> 10 files changed, 1034 insertions(+), 58 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
> create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
> create mode 100644 drivers/power/supply/rt5033_charger.c
All applied. Sent for build testing.
I'll follow-up with a PR soon.
--
Lee Jones [李琼斯]
Enjoy!
The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:
Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-power-v6.5
for you to fetch changes up to b54185c1e3b02c91e4a190ac5c346ea7bfb0de93:
dt-bindings: Add rt5033 MFD, Regulator and Charger (2023-06-08 18:18:13 +0100)
----------------------------------------------------------------
Immutable branch between MFD and Power due for the v6.5 merge window
----------------------------------------------------------------
Jakob Hauser (8):
mfd: rt5033: Fix chip revision readout
mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
mfd: rt5033: Apply preparatory changes before adding rt5033-charger driver
power: supply: rt5033_charger: Add RT5033 charger device driver
power: supply: rt5033_battery: Move struct rt5033_battery to battery driver
power: supply: rt5033_battery: Adopt status property from charger
dt-bindings: power: supply: rt5033-battery: Apply unevaluatedProperties
dt-bindings: Add rt5033 MFD, Regulator and Charger
Stephan Gerhold (1):
mfd: rt5033: Drop rt5033-battery sub-device
.../devicetree/bindings/mfd/richtek,rt5033.yaml | 138 ++++++
.../power/supply/richtek,rt5033-battery.yaml | 2 +-
.../power/supply/richtek,rt5033-charger.yaml | 65 +++
drivers/mfd/rt5033.c | 8 +-
drivers/power/supply/Kconfig | 8 +
drivers/power/supply/Makefile | 1 +
drivers/power/supply/rt5033_battery.c | 38 +-
drivers/power/supply/rt5033_charger.c | 472 +++++++++++++++++++++
include/linux/mfd/rt5033-private.h | 64 ++-
include/linux/mfd/rt5033.h | 24 --
10 files changed, 762 insertions(+), 58 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
create mode 100644 drivers/power/supply/rt5033_charger.c
--
Lee Jones [李琼斯]
Hi Lee,
On 09.06.23 08:47, Lee Jones wrote:
> Enjoy!
>
> The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:
>
> Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-power-v6.5
>
> for you to fetch changes up to b54185c1e3b02c91e4a190ac5c346ea7bfb0de93:
>
> dt-bindings: Add rt5033 MFD, Regulator and Charger (2023-06-08 18:18:13 +0100)
>
> ----------------------------------------------------------------
> Immutable branch between MFD and Power due for the v6.5 merge window
>
> ----------------------------------------------------------------
> Jakob Hauser (8):
> mfd: rt5033: Fix chip revision readout
> mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
> mfd: rt5033: Apply preparatory changes before adding rt5033-charger driver
> power: supply: rt5033_charger: Add RT5033 charger device driver
> power: supply: rt5033_battery: Move struct rt5033_battery to battery driver
> power: supply: rt5033_battery: Adopt status property from charger
> dt-bindings: power: supply: rt5033-battery: Apply unevaluatedProperties
> dt-bindings: Add rt5033 MFD, Regulator and Charger
>
> Stephan Gerhold (1):
> mfd: rt5033: Drop rt5033-battery sub-device
>
> .../devicetree/bindings/mfd/richtek,rt5033.yaml | 138 ++++++
> .../power/supply/richtek,rt5033-battery.yaml | 2 +-
> .../power/supply/richtek,rt5033-charger.yaml | 65 +++
> drivers/mfd/rt5033.c | 8 +-
> drivers/power/supply/Kconfig | 8 +
> drivers/power/supply/Makefile | 1 +
> drivers/power/supply/rt5033_battery.c | 38 +-
> drivers/power/supply/rt5033_charger.c | 472 +++++++++++++++++++++
> include/linux/mfd/rt5033-private.h | 64 ++-
> include/linux/mfd/rt5033.h | 24 --
> 10 files changed, 762 insertions(+), 58 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
> create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
> create mode 100644 drivers/power/supply/rt5033_charger.c
>
I just realized that there is one patch missing in the immutable branch
"ib-mfd-power-v6.5" [1]. Unfortunately I haven't noticed earlier. The
immutable branch holds 9 patches, the patchset has 10 patches [2]. The
missing patch is No. 6 "power: supply: rt5033_charger: Add cable
detection and USB OTG supply".
As this patch No. 6 affects only the file
drivers/power/supply/rt5033_charger.c and is the last patch on that
file, it's no problem to add this patch on top of the other patches.
Could you submit another pull request for the v6.5 merge window to add
this patch?
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=ib-mfd-power-6.5
[2]
https://lore.kernel.org/linux-pm/[email protected]/T/#t
Kind regards,
Jakob
Sebastian,
On Fri, 16 Jun 2023, Jakob Hauser wrote:
> On 09.06.23 08:47, Lee Jones wrote:
> > Enjoy!
> >
> > The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:
> >
> > Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-power-v6.5
> >
> > for you to fetch changes up to b54185c1e3b02c91e4a190ac5c346ea7bfb0de93:
> >
> > dt-bindings: Add rt5033 MFD, Regulator and Charger (2023-06-08 18:18:13 +0100)
> >
> > ----------------------------------------------------------------
> > Immutable branch between MFD and Power due for the v6.5 merge window
> >
> > ----------------------------------------------------------------
> > Jakob Hauser (8):
> > mfd: rt5033: Fix chip revision readout
> > mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
> > mfd: rt5033: Apply preparatory changes before adding rt5033-charger driver
> > power: supply: rt5033_charger: Add RT5033 charger device driver
> > power: supply: rt5033_battery: Move struct rt5033_battery to battery driver
> > power: supply: rt5033_battery: Adopt status property from charger
> > dt-bindings: power: supply: rt5033-battery: Apply unevaluatedProperties
> > dt-bindings: Add rt5033 MFD, Regulator and Charger
> >
> > Stephan Gerhold (1):
> > mfd: rt5033: Drop rt5033-battery sub-device
> >
> > .../devicetree/bindings/mfd/richtek,rt5033.yaml | 138 ++++++
> > .../power/supply/richtek,rt5033-battery.yaml | 2 +-
> > .../power/supply/richtek,rt5033-charger.yaml | 65 +++
> > drivers/mfd/rt5033.c | 8 +-
> > drivers/power/supply/Kconfig | 8 +
> > drivers/power/supply/Makefile | 1 +
> > drivers/power/supply/rt5033_battery.c | 38 +-
> > drivers/power/supply/rt5033_charger.c | 472 +++++++++++++++++++++
> > include/linux/mfd/rt5033-private.h | 64 ++-
> > include/linux/mfd/rt5033.h | 24 --
> > 10 files changed, 762 insertions(+), 58 deletions(-)
> > create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
> > create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
> > create mode 100644 drivers/power/supply/rt5033_charger.c
> >
>
> I just realized that there is one patch missing in the immutable branch
> "ib-mfd-power-v6.5" [1]. Unfortunately I haven't noticed earlier. The
> immutable branch holds 9 patches, the patchset has 10 patches [2]. The
> missing patch is No. 6 "power: supply: rt5033_charger: Add cable detection
> and USB OTG supply".
Did you take this pull-request?
If so, would you like to apply the missing patch or would you like me to
take it via MFD (without a subsequent PR)?
> As this patch No. 6 affects only the file
> drivers/power/supply/rt5033_charger.c and is the last patch on that file,
> it's no problem to add this patch on top of the other patches.
>
> Could you submit another pull request for the v6.5 merge window to add this
> patch?
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=ib-mfd-power-6.5
> [2] https://lore.kernel.org/linux-pm/[email protected]/T/#t
--
Lee Jones [李琼斯]
Hi Sebastian,
The patch 6 "power: supply: rt5033_charger: Add cable detection and USB
OTG supply" of the series v6 RESEND of rt5033-charger is still missing.
On 19.06.23 12:35, Lee Jones wrote:
> Sebastian,
>
> On Fri, 16 Jun 2023, Jakob Hauser wrote:
...
>> I just realized that there is one patch missing in the immutable branch
>> "ib-mfd-power-v6.5" [1]. Unfortunately I haven't noticed earlier. The
>> immutable branch holds 9 patches, the patchset has 10 patches [2]. The
>> missing patch is No. 6 "power: supply: rt5033_charger: Add cable detection
>> and USB OTG supply".
>
> Did you take this pull-request?
>
> If so, would you like to apply the missing patch or would you like me to
> take it via MFD (without a subsequent PR)?
>
>> As this patch No. 6 affects only the file
>> drivers/power/supply/rt5033_charger.c and is the last patch on that file,
>> it's no problem to add this patch on top of the other patches.
>>
>> Could you submit another pull request for the v6.5 merge window to add this
>> patch?
>>
>> [1] https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=ib-mfd-power-6.5
>> [2] https://lore.kernel.org/linux-pm/[email protected]/T/#t
...
The lore link of the series v6 RESEND is above [2]. The patchwork link
to v6 RESEND is:
https://patchwork.kernel.org/project/linux-pm/list/?series=747771&state=%2A&archive=both
Additionally, there were two follow-up clean-up patches. There were no
review comments so far. Lore and patchwork links are:
https://lore.kernel.org/linux-pm/[email protected]/T/#t
https://patchwork.kernel.org/project/linux-pm/list/?series=758018&state=%2A&archive=both
Could you apply those three patches? (1x patch 6 of v6 RESEND series +
2x clean-up patches.)
I've just noticed that a new patch by Rob was added to rt5033-charger.
Can you rebase the other three patches by your own or do you want me to
rebase and resend them?
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/power/supply/rt5033_charger.c?id=2ce8284c31156c432df60d4497ec68cca04e128f
Kind regards,
Jakob