Skip to content

Commit 65234f9

Browse files
torvaldstorvalds
committed
Merge tag 'regulator-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "Other than new device support and some minor fixes this has been a really quiet release, the only notable things are the new drivers. There's a couple of MFDs among the new devices so the generic parts are pulled in: - Support for Analog Devices MAX77831/57/59, Awinc AW37503, Qualcom PMX75 and RFGEN, RealTek RT5733, RichTek RTQ2208 and Texas Instruments TPS65086" * tag 'regulator-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (68 commits) regulator: userspace-consumer: Drop event support for this cycle regulator: aw37503: Switch back to use struct i2c_driver's .probe() dt-bindings: regulator: qcom,rpmh-regulator: allow i, j, l, m & n as RPMh resource name suffix regulator: dt-bindings: Add Awinic AW37503 regulator: aw37503: add regulator driver for Awinic AW37503 regulator: tps65086: Select dedicated regulator config for chip variant mfd: tps65086: Read DEVICE ID register 1 from device regulator: raa215300: Update help description regulator: raa215300: Add missing blank space regulator: raa215300: Change rate from 32000->32768 regulator: db8500-prcmu: Remove unused declaration power_state_active_is_enabled() regulator: raa215300: Add const definition regulator: raa215300: Fix resource leak in case of error regulator: rtq2208: Switch back to use struct i2c_driver's .probe() regulator: lp872x: Fix Wvoid-pointer-to-enum-cast warning regulator: max77857: Fix Wvoid-pointer-to-enum-cast warning regulator: ltc3589: Fix Wvoid-pointer-to-enum-cast warning regulator: qcom_rpm-regulator: Use devm_kmemdup to replace devm_kmalloc + memcpy regulator: tps6286x-regulator: Remove redundant of_match_ptr() macros regulator: pfuze100-regulator: Remove redundant of_match_ptr() macro ...
2 parents 0fc81f3 + b96c224 commit 65234f9

File tree

94 files changed

+2531
-347
lines changed

Some content is hidden

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

94 files changed

+2531
-347
lines changed

‎Documentation/devicetree/bindings/regulator/active-semi,act8846.yaml

Lines changed: 18 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -28,75 +28,37 @@ properties:
2828
the VSEL pin is assumed to be low.
2929
type: boolean
3030

31-
regulators:
32-
type: object
33-
additionalProperties: false
31+
inl1-supply:
32+
description: Handle to the INL1 input supply (REG5-7)
3433

35-
properties:
36-
REG1:
37-
type: object
38-
$ref: /schemas/regulator/regulator.yaml#
39-
unevaluatedProperties: false
34+
inl2-supply:
35+
description: Handle to the INL2 input supply (REG8-9)
4036

41-
properties:
42-
vp1-supply:
43-
description: Handle to the VP1 input supply
37+
inl3-supply:
38+
description: Handle to the INL3 input supply (REG10-12)
4439

45-
REG2:
46-
type: object
47-
$ref: /schemas/regulator/regulator.yaml#
48-
unevaluatedProperties: false
40+
vp1-supply:
41+
description: Handle to the VP1 input supply (REG1)
4942

50-
properties:
51-
vp2-supply:
52-
description: Handle to the VP2 input supply
43+
vp2-supply:
44+
description: Handle to the VP2 input supply (REG2)
5345

54-
REG3:
55-
type: object
56-
$ref: /schemas/regulator/regulator.yaml#
57-
unevaluatedProperties: false
46+
vp3-supply:
47+
description: Handle to the VP3 input supply (REG3)
5848

59-
properties:
60-
vp3-supply:
61-
description: Handle to the VP3 input supply
62-
63-
REG4:
64-
type: object
65-
$ref: /schemas/regulator/regulator.yaml#
66-
unevaluatedProperties: false
49+
vp4-supply:
50+
description: Handle to the VP4 input supply (REG4)
6751

68-
properties:
69-
vp4-supply:
70-
description: Handle to the VP4 input supply
52+
regulators:
53+
type: object
54+
additionalProperties: false
7155

7256
patternProperties:
73-
"^REG[5-7]$":
57+
"^REG([1-9]|1[0-2])$":
7458
type: object
7559
$ref: /schemas/regulator/regulator.yaml#
7660
unevaluatedProperties: false
7761

78-
properties:
79-
inl1-supply:
80-
description: Handle to the INL1 input supply
81-
82-
"^REG[8-9]$":
83-
type: object
84-
$ref: /schemas/regulator/regulator.yaml#
85-
unevaluatedProperties: false
86-
87-
properties:
88-
inl2-supply:
89-
description: Handle to the INL2 input supply
90-
91-
"^REG1[0-2]$":
92-
type: object
93-
$ref: /schemas/regulator/regulator.yaml#
94-
unevaluatedProperties: false
95-
96-
properties:
97-
inl3-supply:
98-
description: Handle to the INL3 input supply
99-
10062
additionalProperties: false
10163

10264
required:

‎Documentation/devicetree/bindings/regulator/adi,max77857.yaml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2022 Analog Devices Inc.
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/regulator/adi,max77857.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Analog Devices MAX77857 Buck-Boost Converter
9+
10+
maintainers:
11+
- Ibrahim Tilki <Ibrahim.Tilki@analog.com>
12+
- Okan Sahin <Okan.Sahin@analog.com>
13+
14+
description: Analog Devices MAX77857 Buck-Boost Converter
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- adi,max77831
20+
- adi,max77857
21+
- adi,max77859
22+
- adi,max77859a
23+
24+
reg:
25+
description: I2C address of the device
26+
items:
27+
- enum: [0x66, 0x67, 0x6E, 0x6F]
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
adi,switch-frequency-hz:
33+
description: Switching frequency of the Buck-Boost converter in Hz.
34+
items:
35+
- enum: [1200000, 1500000, 1800000, 2100000]
36+
37+
adi,rtop-ohms:
38+
description: Top feedback resistor value in ohms for external feedback.
39+
minimum: 150000
40+
maximum: 330000
41+
42+
adi,rbot-ohms:
43+
description: Bottom feedback resistor value in ohms for external feedback.
44+
45+
dependencies:
46+
adi,rtop-ohms: [ 'adi,rbot-ohms' ]
47+
adi,rbot-ohms: [ 'adi,rtop-ohms' ]
48+
49+
required:
50+
- compatible
51+
- reg
52+
53+
allOf:
54+
- $ref: regulator.yaml#
55+
- if:
56+
properties:
57+
compatible:
58+
contains:
59+
enum:
60+
- adi,max77831
61+
62+
then:
63+
properties:
64+
adi,switch-frequency-hz:
65+
items:
66+
enum: [1200000, 1500000, 1800000]
67+
68+
unevaluatedProperties: false
69+
70+
examples:
71+
- |
72+
#include <dt-bindings/interrupt-controller/irq.h>
73+
i2c {
74+
#address-cells = <1>;
75+
#size-cells = <0>;
76+
77+
regulator@66 {
78+
reg = <0x66>;
79+
compatible = "adi,max77857";
80+
interrupt-parent = <&gpio>;
81+
interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
82+
83+
adi,rtop-ohms = <312000>;
84+
adi,rbot-ohms = <12000>;
85+
};
86+
};

‎Documentation/devicetree/bindings/regulator/awinic,aw37503.yaml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/awinic,aw37503.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Awinic AW37503 Voltage Regulator
8+
9+
maintainers:
10+
- Alec Li <like@awinic.com>
11+
12+
description:
13+
The AW37503 are dual voltage regulator, designed to support positive/negative
14+
supply for driving TFT-LCD panels. It support software-configurable output
15+
switching and monitoring. The output voltages can be programmed via an I2C
16+
compatible interface.
17+
18+
properties:
19+
compatible:
20+
const: awinic,aw37503
21+
22+
reg:
23+
maxItems: 1
24+
25+
patternProperties:
26+
"^out[pn]$":
27+
type: object
28+
$ref: regulator.yaml#
29+
unevaluatedProperties: false
30+
description:
31+
Properties for single regulator.
32+
33+
properties:
34+
enable-gpios:
35+
maxItems: 1
36+
description:
37+
GPIO specifier to enable the GPIO control (on/off) for regulator.
38+
39+
required:
40+
- regulator-name
41+
42+
required:
43+
- compatible
44+
- reg
45+
- outp
46+
- outn
47+
48+
additionalProperties: false
49+
50+
examples:
51+
- |
52+
#include <dt-bindings/gpio/gpio.h>
53+
54+
i2c {
55+
#address-cells = <1>;
56+
#size-cells = <0>;
57+
58+
regulator@3e {
59+
compatible = "awinic,aw37503";
60+
reg = <0x3e>;
61+
62+
outp {
63+
regulator-name = "outp";
64+
regulator-boot-on;
65+
regulator-always-on;
66+
enable-gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
67+
};
68+
69+
outn {
70+
regulator-name = "outn";
71+
regulator-boot-on;
72+
regulator-always-on;
73+
enable-gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
74+
};
75+
};
76+
};
77+
...
78+

‎Documentation/devicetree/bindings/regulator/dlg,da9121.yaml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@ properties:
9595
Properties for a single BUCK regulator
9696
9797
properties:
98-
regulator-name:
99-
pattern: "^BUCK([1-2])$"
100-
description: |
101-
BUCK2 present in DA9122, DA9220, DA9131, DA9132 only
102-
10398
regulator-initial-mode:
10499
enum: [ 0, 1, 2, 3 ]
105100
description: Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h
@@ -122,6 +117,23 @@ required:
122117
- reg
123118
- regulators
124119

120+
allOf:
121+
- if:
122+
properties:
123+
compatible:
124+
not:
125+
contains:
126+
enum:
127+
- dlg,da9122
128+
- dlg,da9131
129+
- dlg,da9132
130+
- dlg,da9220
131+
then:
132+
properties:
133+
regulators:
134+
properties:
135+
buck2: false
136+
125137
additionalProperties: false
126138

127139
examples:

0 commit comments

Comments
 (0)