Skip to content

Commit 0df2413

Browse files
committed
Merge tag 'for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel: - Add new Qualcomm PMI8998/PM660 SMB2 charger - bq256xx: support systems without thermistors - cros_pchg: fix peripheral device status after system resume - axp20x_usb_power: add support for AXP192 - qcom-pon: add support for pm8941 - at91-reset: prepare to expose reset reason to sysfs - switch all I2C drivers back to use .probe instead of .probe_new - convert some more DT bindings to YAML - misc cleanups * tag 'for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (28 commits) MAINTAINERS: add documentation file for Microchip SAMA5D2 shutdown controller dt-bindings: power: reset: atmel,sama5d2-shdwc: convert to yaml dt-bindings: power: reset: atmel,at91sam9260-shdwc: convert to yaml power: reset: at91-reset: change the power on reason prototype power: reset: qcom-pon: add support for pm8941-pon dt-bindings: power: reset: qcom-pon: define pm8941-pon power: supply: add Qualcomm PMI8998 SMB2 Charger driver dt-bindings: power: supply: qcom,pmi8998-charger: add bindings for smb2 driver power: supply: rt9467: Make charger-enable control as logic level power: supply: Switch i2c drivers back to use .probe() power: reset: add HAS_IOPORT dependencies dt-bindings: power: supply: axp20x: Add AXP192 compatible power: supply: axp20x_usb_power: Add support for AXP192 power: supply: axp20x_usb_power: Remove variant IDs from VBUS polling check power: supply: axp20x_usb_power: Use regmap field for VBUS disabling power: supply: axp20x_usb_power: Use regmap fields for USB BC feature power: supply: axp20x_usb_power: Use regmap fields for VBUS monitor feature power: supply: axp20x_usb_power: Simplify USB current limit handling power: supply: hwmon: constify pointers to hwmon_channel_info power: supply: twl4030_madc_battery: Refactor twl4030_madc_bat_ext_changed() ...
2 parents 02676ec + ef8d95b commit 0df2413

54 files changed

Lines changed: 1699 additions & 343 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -52,100 +52,6 @@ Example:
5252
reg = <0xe3804000 0x1000>;
5353
};
5454

55-
SHDWC Shutdown Controller
56-
57-
required properties:
58-
- compatible: Should be "atmel,<chip>-shdwc".
59-
<chip> can be "at91sam9260", "at91sam9rl" or "at91sam9x5".
60-
- reg: Should contain registers location and length
61-
- clocks: phandle to input clock.
62-
63-
optional properties:
64-
- atmel,wakeup-mode: String, operation mode of the wakeup mode.
65-
Supported values are: "none", "high", "low", "any".
66-
- atmel,wakeup-counter: Counter on Wake-up 0 (between 0x0 and 0xf).
67-
68-
optional at91sam9260 properties:
69-
- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
70-
71-
optional at91sam9rl properties:
72-
- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
73-
- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
74-
75-
optional at91sam9x5 properties:
76-
- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
77-
78-
Example:
79-
80-
shdwc@fffffd10 {
81-
compatible = "atmel,at91sam9260-shdwc";
82-
reg = <0xfffffd10 0x10>;
83-
clocks = <&clk32k>;
84-
};
85-
86-
SHDWC SAMA5D2-Compatible Shutdown Controller
87-
88-
1) shdwc node
89-
90-
required properties:
91-
- compatible: should be "atmel,sama5d2-shdwc", "microchip,sam9x60-shdwc" or
92-
"microchip,sama7g5-shdwc"
93-
- reg: should contain registers location and length
94-
- clocks: phandle to input clock.
95-
- #address-cells: should be one. The cell is the wake-up input index.
96-
- #size-cells: should be zero.
97-
98-
optional properties:
99-
100-
- debounce-delay-us: minimum wake-up inputs debouncer period in
101-
microseconds. It's usually a board-related property.
102-
- atmel,wakeup-rtc-timer: boolean to enable Real-Time Clock wake-up.
103-
104-
optional microchip,sam9x60-shdwc or microchip,sama7g5-shdwc properties:
105-
- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
106-
107-
The node contains child nodes for each wake-up input that the platform uses.
108-
109-
2) input nodes
110-
111-
Wake-up input nodes are usually described in the "board" part of the Device
112-
Tree. Note also that input 0 is linked to the wake-up pin and is frequently
113-
used.
114-
115-
Required properties:
116-
- reg: should contain the wake-up input index [0 - 15].
117-
118-
Optional properties:
119-
- atmel,wakeup-active-high: boolean, the corresponding wake-up input described
120-
by the child, forces the wake-up of the core power supply on a high level.
121-
The default is to be active low.
122-
123-
Example:
124-
125-
On the SoC side:
126-
shdwc@f8048010 {
127-
compatible = "atmel,sama5d2-shdwc";
128-
reg = <0xf8048010 0x10>;
129-
clocks = <&clk32k>;
130-
#address-cells = <1>;
131-
#size-cells = <0>;
132-
atmel,wakeup-rtc-timer;
133-
};
134-
135-
On the board side:
136-
shdwc@f8048010 {
137-
debounce-delay-us = <976>;
138-
139-
input@0 {
140-
reg = <0>;
141-
};
142-
143-
input@1 {
144-
reg = <1>;
145-
atmel,wakeup-active-high;
146-
};
147-
};
148-
14955
Special Function Registers (SFR)
15056

15157
Special Function Registers (SFR) manage specific aspects of the integrated

Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ patternProperties:
134134
oneOf:
135135
- $ref: /schemas/power/supply/qcom,pm8941-charger.yaml#
136136
- $ref: /schemas/power/supply/qcom,pm8941-coincell.yaml#
137+
- $ref: /schemas/power/supply/qcom,pmi8998-charger.yaml#
137138

138139
"gpio@[0-9a-f]+$":
139140
type: object
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/power/reset/atmel,at91sam9260-shdwc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip AT91 SHDWC Shutdown Controller
8+
9+
maintainers:
10+
- Claudiu Beznea <claudiu.beznea@microchip.com>
11+
12+
description: |
13+
Microchip AT91 SHDWC shutdown controller controls the power supplies VDDIO
14+
and VDDCORE and the wake-up detection on debounced input lines.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- atmel,at91sam9260-shdwc
20+
- atmel,at91sam9rl-shdwc
21+
- atmel,at91sam9x5-shdwc
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
atmel,wakeup-mode:
30+
description: operation mode of the wakeup mode
31+
$ref: /schemas/types.yaml#/definitions/string
32+
enum: [ none, high, low, any ]
33+
34+
atmel,wakeup-counter:
35+
description: counter on wake-up 0
36+
$ref: /schemas/types.yaml#/definitions/uint32
37+
minimum: 0
38+
maximum: 15
39+
40+
atmel,wakeup-rtt-timer:
41+
description: enable real-time timer wake-up
42+
type: boolean
43+
44+
atmel,wakeup-rtc-timer:
45+
description: enable real-time clock wake-up
46+
type: boolean
47+
48+
required:
49+
- compatible
50+
- reg
51+
- clocks
52+
53+
allOf:
54+
- if:
55+
properties:
56+
compatible:
57+
contains:
58+
const: atmel,at91sam9x5-shdwc
59+
then:
60+
properties:
61+
atmel,wakeup-rtt-timer: false
62+
63+
- if:
64+
properties:
65+
compatible:
66+
contains:
67+
const: atmel,at91sam9260-shdwc
68+
then:
69+
properties:
70+
atmel,wakeup-rtc-timer: false
71+
72+
additionalProperties: false
73+
74+
examples:
75+
- |
76+
shdwc: poweroff@fffffd10 {
77+
compatible = "atmel,at91sam9260-shdwc";
78+
reg = <0xfffffd10 0x10>;
79+
clocks = <&clk32k>;
80+
};
81+
82+
...
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/power/reset/atmel,sama5d2-shdwc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip AT91 SAMA5D2 SHDWC Shutdown Controller
8+
9+
maintainers:
10+
- Claudiu Beznea <claudiu.beznea@microchip.com>
11+
12+
description: |
13+
Microchip AT91 SHDWC shutdown controller controls the power supplies VDDIO
14+
and VDDCORE and the wake-up detection on debounced input lines.
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- items:
20+
- const: microchip,sama7g5-shdwc
21+
- const: syscon
22+
- enum:
23+
- atmel,sama5d2-shdwc
24+
- microchip,sam9x60-shdwc
25+
26+
reg:
27+
maxItems: 1
28+
29+
clocks:
30+
maxItems: 1
31+
32+
"#address-cells":
33+
const: 1
34+
35+
"#size-cells":
36+
const: 0
37+
38+
debounce-delay-us:
39+
description:
40+
Minimum wake-up inputs debouncer period in microseconds. It is usually a
41+
board-related property.
42+
43+
atmel,wakeup-rtc-timer:
44+
description: enable real-time clock wake-up
45+
type: boolean
46+
47+
atmel,wakeup-rtt-timer:
48+
description: enable real-time timer wake-up
49+
type: boolean
50+
51+
patternProperties:
52+
"^input@[0-15]$":
53+
description:
54+
Wake-up input nodes. These are usually described in the "board" part of
55+
the Device Tree. Note also that input 0 is linked to the wake-up pin and
56+
is frequently used.
57+
type: object
58+
properties:
59+
reg:
60+
description: contains the wake-up input index
61+
minimum: 0
62+
maximum: 15
63+
64+
atmel,wakeup-active-high:
65+
description:
66+
The corresponding wake-up input described by the child forces the
67+
wake-up of the core power supply on a high level. The default is to
68+
be active low.
69+
type: boolean
70+
71+
required:
72+
- reg
73+
74+
additionalProperties: false
75+
76+
required:
77+
- compatible
78+
- reg
79+
- clocks
80+
81+
allOf:
82+
- if:
83+
properties:
84+
compatible:
85+
contains:
86+
const: atmel,sama5d2-shdwc
87+
then:
88+
properties:
89+
atmel,wakeup-rtt-timer: false
90+
91+
additionalProperties: false
92+
93+
examples:
94+
- |
95+
shdwc: poweroff@f8048010 {
96+
compatible = "atmel,sama5d2-shdwc";
97+
reg = <0xf8048010 0x10>;
98+
clocks = <&clk32k>;
99+
#address-cells = <1>;
100+
#size-cells = <0>;
101+
atmel,wakeup-rtc-timer;
102+
debounce-delay-us = <976>;
103+
104+
input@0 {
105+
reg = <0>;
106+
};
107+
108+
input@1 {
109+
reg = <1>;
110+
atmel,wakeup-active-high;
111+
};
112+
};
113+
114+
...

Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/power/reset/nvmem-reboot-mode.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Generic NVMEM reboot mode
8+
9+
maintainers:
10+
- Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
11+
12+
description:
13+
This driver gets the reboot mode magic value from the reboot-mode driver
14+
and stores it in the NVMEM cell named "reboot-mode". The bootloader can
15+
then read it and take different action according to the value.
16+
17+
properties:
18+
compatible:
19+
const: nvmem-reboot-mode
20+
21+
nvmem-cells:
22+
description:
23+
A phandle pointing to the nvmem-cells node where the vendor-specific
24+
magic value representing the reboot mode is stored.
25+
maxItems: 1
26+
27+
nvmem-cell-names:
28+
items:
29+
- const: reboot-mode
30+
31+
patternProperties:
32+
"^mode-.+":
33+
$ref: /schemas/types.yaml#/definitions/uint32
34+
description: Vendor-specific mode value written to the mode register
35+
36+
required:
37+
- compatible
38+
- nvmem-cells
39+
- nvmem-cell-names
40+
41+
additionalProperties: false
42+
43+
examples:
44+
- |
45+
reboot-mode {
46+
compatible = "nvmem-reboot-mode";
47+
nvmem-cells = <&reboot_reason>;
48+
nvmem-cell-names = "reboot-mode";
49+
mode-recovery = <0x01>;
50+
mode-bootloader = <0x02>;
51+
};
52+
...

0 commit comments

Comments
 (0)