Skip to content

Commit d6ccf45

Browse files
committed
Merge tag 'regulator-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "Quite a quiet release for the regulator API, mainly a few new drivers plus a lot of fixes for the Raspberry Pi panel driver. There's also a SPI commit in here which I managed to apply to the wrong tree and then didn't notice until there were too many commits on top of it, sorry about that. - Make it easier to use the virtual consumer test driver with DT systems. - Substantial overhaul providing various fixes and robustness improvements for the Raspberry Pi panel driver. - Support for Qualcomm PMX65 and SDX65, Richtek RT5190A, and Texas Instruments TPS62864x" * tag 'regulator-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (26 commits) regulator: qcom-rpmh: Add support for SDX65 regulator: dt-bindings: Add PMX65 compatibles regulator: vctrl: Use min() instead of doing it manually regulator: rt5190a: Add support for Richtek RT5190A PMIC regulator: Add bindings for Richtek RT5190A PMIC regulator: Convert TPS62360 binding to json-schema regulator: cleanup comments regulator: virtual: add devicetree support regulator: virtual: warn against production use regulator: virtual: use dev_err_probe() regulator: tps62864: Fix bindings for SW property regulator: Add support for TPS6286x regulator: Add bindings for TPS62864x regulator/rpi-panel-attiny: Use two transactions for I2C read regulator/rpi-panel-attiny: Use the regmap cache regulator: rpi-panel: Remove get_brightness hook regulator: rpi-panel: Add GPIO control for panel and touch resets regulator: rpi-panel: Convert to drive lines directly regulator: rpi-panel: Ensure the backlight is off during probe. regulator: rpi-panel: Serialise operations. ...
2 parents a50a8c3 + 5999f85 commit d6ccf45

23 files changed

Lines changed: 1360 additions & 114 deletions

Documentation/devicetree/bindings/regulator/maxim,max8973.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ examples:
113113
};
114114
115115
- |
116-
#include <dt-bindings/gpio/tegra-gpio.h>
116+
#include <dt-bindings/gpio/gpio.h>
117117
#include <dt-bindings/interrupt-controller/irq.h>
118118
119119
i2c {
@@ -123,8 +123,7 @@ examples:
123123
regulator@1b {
124124
compatible = "maxim,max77621";
125125
reg = <0x1b>;
126-
interrupt-parent = <&gpio>;
127-
interrupts = <TEGRA_GPIO(Y, 1) IRQ_TYPE_LEVEL_LOW>;
126+
interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
128127
129128
regulator-always-on;
130129
regulator-boot-on;

Documentation/devicetree/bindings/regulator/pfuze100.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ properties:
7070
$ref: "regulator.yaml#"
7171
type: object
7272

73-
"^(vsnvs|vref|vrefddr|swbst|coin)$":
73+
"^vldo[1-4]$":
74+
$ref: "regulator.yaml#"
75+
type: object
76+
77+
"^(vsnvs|vref|vrefddr|swbst|coin|v33|vccsd)$":
7478
$ref: "regulator.yaml#"
7579
type: object
7680

Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ description: |
4848
For PMI8998, bob
4949
For PMR735A, smps1 - smps3, ldo1 - ldo7
5050
For PMX55, smps1 - smps7, ldo1 - ldo16
51+
For PMX65, smps1 - smps8, ldo1 - ldo21
5152
5253
properties:
5354
compatible:
@@ -70,6 +71,7 @@ properties:
7071
- qcom,pmm8155au-rpmh-regulators
7172
- qcom,pmr735a-rpmh-regulators
7273
- qcom,pmx55-rpmh-regulators
74+
- qcom,pmx65-rpmh-regulators
7375

7476
qcom,pmic-id:
7577
description: |
Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/richtek,rt5190a-regulator.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Richtek RT5190A PMIC Regulator
8+
9+
maintainers:
10+
- ChiYuan Huang <cy_huang@richtek.com>
11+
12+
description: |
13+
The RT5190A integrates 1 channel buck controller, 3 channels high efficiency
14+
synchronous buck converters, 1 LDO, I2C control interface and peripherial
15+
logical control.
16+
17+
It also supports mute AC OFF depop sound and quick setting storage while
18+
input power is removed.
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- richtek,rt5190a
24+
25+
reg:
26+
maxItems: 1
27+
28+
interrupts:
29+
maxItems: 1
30+
31+
vin2-supply:
32+
description: phandle to buck2 input voltage.
33+
34+
vin3-supply:
35+
description: phandle to buck3 input voltage.
36+
37+
vin4-supply:
38+
description: phandle to buck4 input voltage.
39+
40+
vinldo-supply:
41+
description: phandle to ldo input voltage
42+
43+
richtek,mute-enable:
44+
description: |
45+
The mute function uses 'mutein', 'muteout', and 'vdet' pins as the control
46+
signal. When enabled, The normal behavior is to bypass the 'mutein' signal
47+
'muteout'. But if the power source removal is detected from 'vdet',
48+
whatever the 'mutein' signal is, it will pull down the 'muteout' to force
49+
speakers mute. this function is commonly used to prevent the speaker pop
50+
noise during AC power turned off in the modern TV system design.
51+
type: boolean
52+
53+
regulators:
54+
type: object
55+
56+
patternProperties:
57+
"^buck[1-4]$|^ldo$":
58+
type: object
59+
$ref: regulator.yaml#
60+
description: |
61+
regulator description for buck1 and buck4.
62+
63+
properties:
64+
regulator-allowed-modes:
65+
description: |
66+
buck operating mode, only buck1/4 support mode operating.
67+
0: auto mode
68+
1: force pwm mode
69+
items:
70+
enum: [0, 1]
71+
72+
richtek,latchup-enable:
73+
type: boolean
74+
description: |
75+
If specified, undervolt protection mode changes from the default
76+
hiccup to latchup.
77+
78+
unevaluatedProperties: false
79+
80+
additionalProperties: false
81+
82+
required:
83+
- compatible
84+
- reg
85+
- regulators
86+
87+
additionalProperties: false
88+
89+
examples:
90+
- |
91+
#include <dt-bindings/interrupt-controller/irq.h>
92+
#include <dt-bindings/regulator/richtek,rt5190a-regulator.h>
93+
94+
i2c {
95+
#address-cells = <1>;
96+
#size-cells = <0>;
97+
98+
pmic@64 {
99+
compatible = "richtek,rt5190a";
100+
reg = <0x64>;
101+
interrupts-extended = <&gpio26 0 IRQ_TYPE_LEVEL_LOW>;
102+
vin2-supply = <&rt5190_buck1>;
103+
vin3-supply = <&rt5190_buck1>;
104+
vin4-supply = <&rt5190_buck1>;
105+
106+
regulators {
107+
rt5190_buck1: buck1 {
108+
regulator-name = "rt5190a-buck1";
109+
regulator-min-microvolt = <5090000>;
110+
regulator-max-microvolt = <5090000>;
111+
regulator-allowed-modes = <RT5190A_OPMODE_AUTO RT5190A_OPMODE_FPWM>;
112+
regulator-boot-on;
113+
};
114+
buck2 {
115+
regulator-name = "rt5190a-buck2";
116+
regulator-min-microvolt = <600000>;
117+
regulator-max-microvolt = <1400000>;
118+
regulator-boot-on;
119+
};
120+
buck3 {
121+
regulator-name = "rt5190a-buck3";
122+
regulator-min-microvolt = <600000>;
123+
regulator-max-microvolt = <1400000>;
124+
regulator-boot-on;
125+
};
126+
buck4 {
127+
regulator-name = "rt5190a-buck4";
128+
regulator-min-microvolt = <850000>;
129+
regulator-max-microvolt = <850000>;
130+
regulator-allowed-modes = <RT5190A_OPMODE_AUTO RT5190A_OPMODE_FPWM>;
131+
regulator-boot-on;
132+
};
133+
ldo {
134+
regulator-name = "rt5190a-ldo";
135+
regulator-min-microvolt = <1200000>;
136+
regulator-max-microvolt = <1200000>;
137+
regulator-boot-on;
138+
};
139+
};
140+
};
141+
};
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/ti,tps62360.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Texas Instruments TPS6236x Voltage Regulators
8+
9+
maintainers:
10+
- Laxman Dewangan <ldewangan@nvidia.com>
11+
12+
description: |
13+
The TPS6236x are a family of step down dc-dc converter with
14+
an input voltage range of 2.5V to 5.5V. The devices provide
15+
up to 3A peak load current, and an output voltage range of
16+
0.77V to 1.4V (TPS62360/62) and 0.5V to 1.77V (TPS62361B/63).
17+
18+
Datasheet is available at:
19+
https://www.ti.com/lit/gpn/tps62360
20+
21+
allOf:
22+
- $ref: "regulator.yaml#"
23+
24+
properties:
25+
compatible:
26+
enum:
27+
- ti,tps62360
28+
- ti,tps62361
29+
- ti,tps62362
30+
- ti,tps62363
31+
32+
reg:
33+
maxItems: 1
34+
35+
ti,vsel0-gpio:
36+
description: |
37+
GPIO for controlling VSEL0 line. If this property
38+
is missing, then assume that there is no GPIO for
39+
VSEL0 control.
40+
maxItems: 1
41+
42+
ti,vsel1-gpio:
43+
description: |
44+
GPIO for controlling VSEL1 line. If this property
45+
is missing, then assume that there is no GPIO for
46+
VSEL1 control.
47+
maxItems: 1
48+
49+
ti,enable-vout-discharge:
50+
description: Enable output discharge.
51+
type: boolean
52+
53+
ti,enable-pull-down:
54+
description: Enable pull down.
55+
type: boolean
56+
57+
ti,vsel0-state-high:
58+
description: |
59+
Initial state of VSEL0 input is high. If this property
60+
is missing, then assume the state as low.
61+
type: boolean
62+
63+
ti,vsel1-state-high:
64+
description: |
65+
Initial state of VSEL1 input is high. If this property
66+
is missing, then assume the state as low.
67+
type: boolean
68+
69+
required:
70+
- compatible
71+
- reg
72+
73+
unevaluatedProperties: false
74+
75+
examples:
76+
- |
77+
#include <dt-bindings/gpio/gpio.h>
78+
i2c {
79+
#address-cells = <1>;
80+
#size-cells = <0>;
81+
82+
regulator@60 {
83+
compatible = "ti,tps62361";
84+
reg = <0x60>;
85+
regulator-name = "tps62361-vout";
86+
regulator-min-microvolt = <500000>;
87+
regulator-max-microvolt = <1500000>;
88+
regulator-boot-on;
89+
ti,vsel0-gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;
90+
ti,vsel1-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
91+
ti,vsel0-state-high;
92+
ti,vsel1-state-high;
93+
ti,enable-pull-down;
94+
ti,enable-vout-discharge;
95+
};
96+
};
97+
98+
...
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/ti,tps62864.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TI TPS62864/TPS6286/TPS62868/TPS62869 voltage regulator
8+
9+
maintainers:
10+
- Vincent Whitchurch <vincent.whitchurch@axis.com>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- ti,tps62864
16+
- ti,tps62866
17+
- ti,tps62868
18+
- ti,tps62869
19+
20+
reg:
21+
maxItems: 1
22+
23+
regulators:
24+
type: object
25+
26+
properties:
27+
"SW":
28+
type: object
29+
$ref: regulator.yaml#
30+
unevaluatedProperties: false
31+
32+
additionalProperties: false
33+
34+
required:
35+
- compatible
36+
- reg
37+
- regulators
38+
39+
additionalProperties: false
40+
41+
examples:
42+
- |
43+
#include <dt-bindings/regulator/ti,tps62864.h>
44+
i2c {
45+
#address-cells = <1>;
46+
#size-cells = <0>;
47+
48+
regulator@48 {
49+
compatible = "ti,tps62864";
50+
reg = <0x48>;
51+
52+
regulators {
53+
SW {
54+
regulator-name = "+0.85V";
55+
regulator-min-microvolt = <800000>;
56+
regulator-max-microvolt = <890000>;
57+
regulator-initial-mode = <TPS62864_MODE_FPWM>;
58+
};
59+
};
60+
};
61+
};
62+
63+
...

Documentation/devicetree/bindings/regulator/tps62360-regulator.txt

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)