forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/gi…
…t/sre/linux-power-supply Pull power supply and reset updates from Sebastian Reichel: "Power-supply core: - add wireless type - properly document current direction Battery/charger driver changes: - new fuel-gauge/charger driver for RN5T618/RN5T619 - new charger driver for BQ25980, BQ25975 and BQ25960 - bq27xxx-battery: add support for TI bq34z100 - gpio-charger: convert to GPIO descriptors - gpio-charger: add optional support for charge current limiting - max17040: add support for max17041, max17043, max17044 - max17040: add support for max17048, max17049, max17058, max17059 - smb347-charger: add DT support - smb247-charger: add SMB345 and SMB358 support - simple-battery: add temperature properties - lots of minor fixes, cleanups and DT binding YAML conversions Reset drivers: - ocelot: Add support for Sparx5" * tag 'for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (81 commits) power: reset: POWER_RESET_OCELOT_RESET should depend on Ocelot or Sparx5 power: supply: bq25980: Fix uninitialized wd_reg_val and overrun power: supply: ltc2941: Fix ptr to enum cast power: supply: test-power: revise parameter printing to use sprintf power: supply: charger-manager: fix incorrect check on charging_duration_ms power: supply: max17040: Fix ptr to enum cast power: supply: bq25980: Fix uninitialized wd_reg_val power: supply: bq25980: remove redundant zero check on ret power: reset: ocelot: Add support for Sparx5 dt-bindings: reset: ocelot: Add Sparx5 support power: supply: sbs-battery: keep error code when get_property() fails power: supply: bq25980: Add support for the BQ259xx family dt-binding: bq25980: Add the bq25980 flash charger power: supply: fix spelling mistake "unprecise" -> "imprecise" power: supply: test_power: add missing newlines when printing parameters by sysfs power: supply: pm2301: drop duplicated i2c_device_id power: supply: charger-manager: drop unused charger assignment power: supply: rt9455: skip 'struct acpi_device_id' when !CONFIG_ACPI power: supply: goldfish: skip 'struct acpi_device_id' when !CONFIG_ACPI power: supply: bq25890: skip 'struct acpi_device_id' when !CONFIG_ACPI ...
- Loading branch information
Showing
55 changed files
with
3,938 additions
and
1,383 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 5 additions & 2 deletions
7
Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 0 additions & 25 deletions
25
Documentation/devicetree/bindings/power/reset/reboot-mode.txt
This file was deleted.
Oops, something went wrong.
47 changes: 47 additions & 0 deletions
47
Documentation/devicetree/bindings/power/reset/reboot-mode.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/power/reset/reboot-mode.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Generic reboot mode core map | ||
|
|
||
| maintainers: | ||
| - Andy Yan <[email protected]> | ||
|
|
||
| description: | | ||
| This driver get reboot mode arguments and call the write | ||
| interface to store the magic value in special register | ||
| or ram. Then the bootloader can read it and take different | ||
| action according to the argument stored. | ||
| All mode properties are vendor specific, it is a indication to tell | ||
| the bootloader what to do when the system reboots, and should be named | ||
| as mode-xxx = <magic> (xxx is mode name, magic should be a non-zero value). | ||
| For example, modes common Android platform are: | ||
| - normal: Normal reboot mode, system reboot with command "reboot". | ||
| - recovery: Android Recovery mode, it is a mode to format the device or update a new image. | ||
| - bootloader: Android fastboot mode, it's a mode to re-flash partitions on the Android based device. | ||
| - loader: A bootloader mode, it's a mode used to download image on Rockchip platform, | ||
| usually used in development. | ||
| properties: | ||
| mode-normal: | ||
| $ref: /schemas/types.yaml#/definitions/uint32 | ||
| description: | | ||
| Default value to set on a reboot if no command was provided. | ||
| patternProperties: | ||
| "^mode-.*$": | ||
| $ref: /schemas/types.yaml#/definitions/uint32 | ||
|
|
||
| examples: | ||
| - | | ||
| reboot-mode { | ||
| mode-normal = <0>; | ||
| mode-recovery = <1>; | ||
| mode-bootloader = <2>; | ||
| mode-loader = <3>; | ||
| }; | ||
| ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
Documentation/devicetree/bindings/power/supply/bq25980.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| # Copyright (C) 2020 Texas Instruments Incorporated | ||
| %YAML 1.2 | ||
| --- | ||
| $id: "http://devicetree.org/schemas/power/supply/bq25980.yaml#" | ||
| $schema: "http://devicetree.org/meta-schemas/core.yaml#" | ||
|
|
||
| title: TI BQ25980 Flash Charger | ||
|
|
||
| maintainers: | ||
| - Dan Murphy <[email protected]> | ||
| - Ricardo Rivera-Matos <[email protected]> | ||
|
|
||
| description: | | ||
| The BQ25980, BQ25975, and BQ25960 are a series of flash chargers intended | ||
| for use in high-power density portable electronics. These inductorless | ||
| switching chargers can provide over 97% efficiency by making use of the | ||
| switched capacitor architecture. | ||
| allOf: | ||
| - $ref: power-supply.yaml# | ||
|
|
||
| properties: | ||
| compatible: | ||
| enum: | ||
| - ti,bq25980 | ||
| - ti,bq25975 | ||
| - ti,bq25960 | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| ti,watchdog-timeout-ms: | ||
| description: | | ||
| Watchdog timer in milli seconds. 0 disables the watchdog. | ||
| default: 0 | ||
| minimum: 0 | ||
| maximum: 300000 | ||
| enum: [ 0, 5000, 10000, 50000, 300000] | ||
|
|
||
| ti,sc-ovp-limit-microvolt: | ||
| description: | | ||
| Minimum input voltage limit in micro volts with a when the charger is in | ||
| switch cap mode. 100000 micro volt step. | ||
| default: 17800000 | ||
| minimum: 14000000 | ||
| maximum: 22000000 | ||
|
|
||
| ti,sc-ocp-limit-microamp: | ||
| description: | | ||
| Maximum input current limit in micro amps with a 100000 micro amp step. | ||
| minimum: 100000 | ||
| maximum: 3300000 | ||
|
|
||
| ti,bypass-ovp-limit-microvolt: | ||
| description: | | ||
| Minimum input voltage limit in micro volts with a when the charger is in | ||
| switch cap mode. 50000 micro volt step. | ||
| minimum: 7000000 | ||
| maximum: 12750000 | ||
|
|
||
| ti,bypass-ocp-limit-microamp: | ||
| description: | | ||
| Maximum input current limit in micro amps with a 100000 micro amp step. | ||
| minimum: 100000 | ||
| maximum: 3300000 | ||
|
|
||
| ti,bypass-enable: | ||
| type: boolean | ||
| description: Enables bypass mode at boot time | ||
|
|
||
| interrupts: | ||
| description: | | ||
| Indicates that the device state has changed. | ||
| monitored-battery: | ||
| $ref: /schemas/types.yaml#/definitions/phandle | ||
| description: phandle to the battery node being monitored | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - monitored-battery | ||
|
|
||
| unevaluatedProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| bat: battery { | ||
| compatible = "simple-battery"; | ||
| constant-charge-current-max-microamp = <4000000>; | ||
| constant-charge-voltage-max-microvolt = <8400000>; | ||
| precharge-current-microamp = <160000>; | ||
| charge-term-current-microamp = <160000>; | ||
| }; | ||
| #include <dt-bindings/gpio/gpio.h> | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
| i2c0 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| bq25980: charger@65 { | ||
| compatible = "ti,bq25980"; | ||
| reg = <0x65>; | ||
| interrupt-parent = <&gpio1>; | ||
| interrupts = <16 IRQ_TYPE_EDGE_FALLING>; | ||
| ti,watchdog-timer = <0>; | ||
| ti,sc-ocp-limit-microamp = <2000000>; | ||
| ti,sc-ovp-limit-microvolt = <17800000>; | ||
| monitored-battery = <&bat>; | ||
| }; | ||
| }; | ||
| ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,6 +51,7 @@ properties: | |
| - ti,bq27621 | ||
| - ti,bq27z561 | ||
| - ti,bq28z610 | ||
| - ti,bq34z100 | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.