Skip to content

Commit 07b4382

Browse files
committed
Merge tag 'for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel: "Power-supply core: - battery-info: replace any DT specific bits with fwnode usage - replace any device-tree code with generic fwnode based handling Power-supply drivers: - ug3105_battery: use battery-info API - qcom_battmgr: report capacity - qcom_battmgr: support LiPo battery reporting - add missing missing power-supply ref to a bunch of DT bindings - update drivers regarding pm_runtime_autosuspend() usage - misc minor fixes and cleanups Reset drivers: - misc minor cleanups" * tag 'for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (32 commits) power: supply: core: fix static checker warning power: supply: twl4030_charger: Remove redundant pm_runtime_mark_last_busy() calls power: supply: bq24190: Remove redundant pm_runtime_mark_last_busy() calls MAINTAINERS: rectify file entry in QUALCOMM SMB CHARGER DRIVER power: supply: max1720x correct capacity computation MAINTAINERS: add myself as smbx charger driver maintainer power: supply: pmi8998_charger: rename to qcom_smbx power: supply: qcom_pmi8998_charger: fix wakeirq power: supply: max14577: Handle NULL pdata when CONFIG_OF is not set power: return the correct error code power: reset: POWER_RESET_TORADEX_EC should depend on ARCH_MXC power: supply: cpcap-charger: Fix null check for power_supply_get_by_name power: supply: bq25980_charger: Constify reg_default array power: supply: bq256xx_charger: Constify reg_default array power: reset: at91-sama5d2_shdwc: Refactor wake-up source logging to use dev_info power: reset: qcom-pon: Rename variables to use generic naming power: supply: qcom_battmgr: Add lithium-polymer entry power: supply: qcom_battmgr: Report battery capacity power: supply: bq24190: Free battery_info power: supply: ug3105_battery: Switch to power_supply_batinfo_ocv2cap() ...
2 parents b80a75c + 7b41a23 commit 07b4382

33 files changed

+285
-333
lines changed

Documentation/devicetree/bindings/power/supply/bq24190.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ properties:
4848
battery device.
4949
5050
monitored-battery:
51-
$ref: /schemas/types.yaml#/definitions/phandle
5251
description: |
5352
phandle to a "simple-battery" compatible node.
5453

Documentation/devicetree/bindings/power/supply/bq2515x.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,16 @@ properties:
5353
minimum: 50000
5454
maximum: 500000
5555

56-
monitored-battery:
57-
$ref: /schemas/types.yaml#/definitions/phandle
58-
description: phandle to the battery node being monitored
56+
monitored-battery: true
5957

6058
required:
6159
- compatible
6260
- reg
6361
- monitored-battery
6462

63+
allOf:
64+
- $ref: power-supply.yaml#
65+
6566
additionalProperties: false
6667

6768
examples:

Documentation/devicetree/bindings/power/supply/bq256xx.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ properties:
5858
minimum: 100000
5959
maximum: 3200000
6060

61-
monitored-battery:
62-
$ref: /schemas/types.yaml#/definitions/phandle
63-
description: phandle to the battery node being monitored
61+
monitored-battery: true
6462

6563
interrupts:
6664
maxItems: 1
@@ -78,6 +76,7 @@ required:
7876
- monitored-battery
7977

8078
allOf:
79+
- $ref: power-supply.yaml#
8180
- if:
8281
properties:
8382
compatible:

Documentation/devicetree/bindings/power/supply/bq25980.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ properties:
7373
description: |
7474
Indicates that the device state has changed.
7575
76-
monitored-battery:
77-
$ref: /schemas/types.yaml#/definitions/phandle
78-
description: phandle to the battery node being monitored
76+
monitored-battery: true
7977

8078
required:
8179
- compatible

Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ properties:
4343
minItems: 1
4444
maxItems: 8 # Should be enough
4545

46-
monitored-battery:
47-
description:
48-
Specifies the phandle of a simple-battery connected to this gauge
49-
$ref: /schemas/types.yaml#/definitions/phandle
46+
monitored-battery: true
5047

5148
required:
5249
- compatible

Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ properties:
3838
- const: usbin_i
3939
- const: usbin_v
4040

41-
monitored-battery:
42-
description: phandle to the simple-battery node
43-
$ref: /schemas/types.yaml#/definitions/phandle
41+
monitored-battery: true
4442

4543
required:
4644
- compatible
@@ -51,6 +49,9 @@ required:
5149
- io-channel-names
5250
- monitored-battery
5351

52+
allOf:
53+
- $ref: power-supply.yaml#
54+
5455
additionalProperties: false
5556

5657
examples:

Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ properties:
1818
const: richtek,rt5033-charger
1919

2020
monitored-battery:
21-
$ref: /schemas/types.yaml#/definitions/phandle
2221
description: |
2322
Phandle to the monitored battery according to battery.yaml. The battery
2423
node needs to contain five parameters.
@@ -54,6 +53,9 @@ properties:
5453
required:
5554
- monitored-battery
5655

56+
allOf:
57+
- $ref: power-supply.yaml#
58+
5759
additionalProperties: false
5860

5961
examples:

Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ properties:
1717
compatible:
1818
const: stericsson,ab8500-btemp
1919

20-
monitored-battery:
21-
$ref: /schemas/types.yaml#/definitions/phandle
22-
description: phandle to battery node
20+
monitored-battery: true
2321

2422
battery:
2523
$ref: /schemas/types.yaml#/definitions/phandle

Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ properties:
1717
compatible:
1818
const: stericsson,ab8500-chargalg
1919

20-
monitored-battery:
21-
$ref: /schemas/types.yaml#/definitions/phandle
22-
description: phandle to battery node
20+
monitored-battery: true
2321

2422
battery:
2523
$ref: /schemas/types.yaml#/definitions/phandle

Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ properties:
1717
compatible:
1818
const: stericsson,ab8500-charger
1919

20-
monitored-battery:
21-
$ref: /schemas/types.yaml#/definitions/phandle
22-
description: phandle to battery node
20+
monitored-battery: true
2321

2422
battery:
2523
$ref: /schemas/types.yaml#/definitions/phandle

0 commit comments

Comments
 (0)