Skip to content

Commit 9b18d07

Browse files
torvaldstorvalds
committed
Merge tag 'regulator-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "This is mostly a drivers update including a couple of new drivers but we do have some fixes and improvements to the core as well. - Make sure we don't log spuriously about uncontrollable regulators. - Don't use delays when we should use sleeps for regulators with larger ramp times. - Support for MediaTek MT6358 and MT6366, Richtek RT5759 and Silicon Mitus SM5703" * tag 'regulator-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (36 commits) regulator: scmi: Fix refcount leak in scmi_regulator_probe regulator: pfuze100: Fix refcount leak in pfuze_parse_regulators_dt regulator: qcom_smd: Fix up PM8950 regulator configuration regulator: core: Fix enable_count imbalance with EXCLUSIVE_GET regulator: core: Add error flags to sysfs attributes regulator: dt-bindings: qcom,rpmh: document vdd-l7-bob-supply on PMR735A regulator: dt-bindings: qcom,rpmh: document supplies per variant regulator: dt-bindings: qcom,rpmh: update maintainers regulator: mt6315: Enforce regulator-compatible, not name regulator: pca9450: Enable DVS control via PMIC_STBY_REQ regulator: pca9450: Make warm reset on WDOG_B assertion regulator: Add property for WDOG_B warm reset regulator: pca9450: Make I2C Level Translator configurable regulator: Add property for I2C level shifter regulator: sm5703: Correct reference to the common regulator schema regulator: sm5703-regulator: Add regulators support for SM5703 MFD dt-bindings: regulator: Add bindings for Silicon Mitus SM5703 regulators regulator: richtek,rt4801: parse GPIOs per regulator regulator: dt-bindings: richtek,rt4801: use existing ena_gpiod feature regulator: core: Sleep (not delay) in set_voltage() ...
2 parents 5d23bb5 + a5b8e4a commit 9b18d07

26 files changed

Lines changed: 1538 additions & 123 deletions

‎Documentation/ABI/testing/sysfs-class-regulator‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,3 +370,84 @@ Description:
370370

371371
'unknown' means software cannot determine the state, or
372372
the reported state is invalid.
373+
374+
What: /sys/class/regulator/.../under_voltage
375+
Date: April 2022
376+
KernelVersion: 5.18
377+
Contact: Zev Weiss <zev@bewilderbeest.net>
378+
Description:
379+
Some regulator directories will contain a field called
380+
under_voltage. This indicates if the device reports an
381+
under-voltage fault (1) or not (0).
382+
383+
What: /sys/class/regulator/.../over_current
384+
Date: April 2022
385+
KernelVersion: 5.18
386+
Contact: Zev Weiss <zev@bewilderbeest.net>
387+
Description:
388+
Some regulator directories will contain a field called
389+
over_current. This indicates if the device reports an
390+
over-current fault (1) or not (0).
391+
392+
What: /sys/class/regulator/.../regulation_out
393+
Date: April 2022
394+
KernelVersion: 5.18
395+
Contact: Zev Weiss <zev@bewilderbeest.net>
396+
Description:
397+
Some regulator directories will contain a field called
398+
regulation_out. This indicates if the device reports an
399+
out-of-regulation fault (1) or not (0).
400+
401+
What: /sys/class/regulator/.../fail
402+
Date: April 2022
403+
KernelVersion: 5.18
404+
Contact: Zev Weiss <zev@bewilderbeest.net>
405+
Description:
406+
Some regulator directories will contain a field called
407+
fail. This indicates if the device reports an output failure
408+
(1) or not (0).
409+
410+
What: /sys/class/regulator/.../over_temp
411+
Date: April 2022
412+
KernelVersion: 5.18
413+
Contact: Zev Weiss <zev@bewilderbeest.net>
414+
Description:
415+
Some regulator directories will contain a field called
416+
over_temp. This indicates if the device reports an
417+
over-temperature fault (1) or not (0).
418+
419+
What: /sys/class/regulator/.../under_voltage_warn
420+
Date: April 2022
421+
KernelVersion: 5.18
422+
Contact: Zev Weiss <zev@bewilderbeest.net>
423+
Description:
424+
Some regulator directories will contain a field called
425+
under_voltage_warn. This indicates if the device reports an
426+
under-voltage warning (1) or not (0).
427+
428+
What: /sys/class/regulator/.../over_current_warn
429+
Date: April 2022
430+
KernelVersion: 5.18
431+
Contact: Zev Weiss <zev@bewilderbeest.net>
432+
Description:
433+
Some regulator directories will contain a field called
434+
over_current_warn. This indicates if the device reports an
435+
over-current warning (1) or not (0).
436+
437+
What: /sys/class/regulator/.../over_voltage_warn
438+
Date: April 2022
439+
KernelVersion: 5.18
440+
Contact: Zev Weiss <zev@bewilderbeest.net>
441+
Description:
442+
Some regulator directories will contain a field called
443+
over_voltage_warn. This indicates if the device reports an
444+
over-voltage warning (1) or not (0).
445+
446+
What: /sys/class/regulator/.../over_temp_warn
447+
Date: April 2022
448+
KernelVersion: 5.18
449+
Contact: Zev Weiss <zev@bewilderbeest.net>
450+
Description:
451+
Some regulator directories will contain a field called
452+
over_temp_warn. This indicates if the device reports an
453+
over-temperature warning (1) or not (0).

‎Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ properties:
3131
$ref: "regulator.yaml#"
3232

3333
properties:
34-
regulator-name:
34+
regulator-compatible:
3535
pattern: "^vbuck[1-4]$"
3636

3737
additionalProperties: false

‎Documentation/devicetree/bindings/regulator/mt6358-regulator.txt‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ Documentation/devicetree/bindings/regulator/regulator.txt.
88

99
The valid names for regulators are::
1010
BUCK:
11-
buck_vdram1, buck_vcore, buck_vpa, buck_vproc11, buck_vproc12, buck_vgpu,
12-
buck_vs2, buck_vmodem, buck_vs1
11+
buck_vdram1, buck_vcore, buck_vcore_sshub, buck_vpa, buck_vproc11,
12+
buck_vproc12, buck_vgpu, buck_vs2, buck_vmodem, buck_vs1
1313
LDO:
1414
ldo_vdram2, ldo_vsim1, ldo_vibr, ldo_vrf12, ldo_vio18, ldo_vusb, ldo_vcamio,
1515
ldo_vcamd, ldo_vcn18, ldo_vfe28, ldo_vsram_proc11, ldo_vcn28, ldo_vsram_others,
16-
ldo_vsram_gpu, ldo_vxo22, ldo_vefuse, ldo_vaux18, ldo_vmch, ldo_vbif28,
17-
ldo_vsram_proc12, ldo_vcama1, ldo_vemc, ldo_vio28, ldo_va12, ldo_vrf18,
18-
ldo_vcn33_bt, ldo_vcn33_wifi, ldo_vcama2, ldo_vmc, ldo_vldo28, ldo_vaud28,
16+
ldo_vsram_others_sshub, ldo_vsram_gpu, ldo_vxo22, ldo_vefuse, ldo_vaux18,
17+
ldo_vmch, ldo_vbif28, ldo_vsram_proc12, ldo_vcama1, ldo_vemc, ldo_vio28, ldo_va12,
18+
ldo_vrf18, ldo_vcn33_bt, ldo_vcn33_wifi, ldo_vcama2, ldo_vmc, ldo_vldo28, ldo_vaud28,
1919
ldo_vsim2
2020

2121
Example:
@@ -354,5 +354,17 @@ Example:
354354
regulator-max-microvolt = <3100000>;
355355
regulator-enable-ramp-delay = <540>;
356356
};
357+
358+
mt6358_vcore_sshub_reg: buck_vcore_sshub {
359+
regulator-name = "vcore_sshub";
360+
regulator-min-microvolt = <500000>;
361+
regulator-max-microvolt = <1293750>;
362+
};
363+
364+
mt6358_vsram_others_sshub_reg: ldo_vsram_others_sshub {
365+
regulator-name = "vsram_others_sshub";
366+
regulator-min-microvolt = <500000>;
367+
regulator-max-microvolt = <1293750>;
368+
};
357369
};
358370
};

‎Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,17 @@ properties:
9292
LDO5CTRL_L or LDO5CTRL_H register. Use this if the SD_VSEL signal is
9393
connected to a host GPIO.
9494

95+
nxp,i2c-lt-enable:
96+
type: boolean
97+
description:
98+
Indicates that the I2C Level Translator is used.
99+
100+
nxp,wdog_b-warm-reset:
101+
type: boolean
102+
description:
103+
When WDOG_B signal is asserted a warm reset will be done instead of cold
104+
reset.
105+
95106
required:
96107
- compatible
97108
- reg

0 commit comments

Comments
 (0)